Changeset 3e828ea in mainline for uspace/app/bdsh/scli.h

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/app/bdsh/scli.h (modified) (3 diffs)

uspace/app/bdsh/scli.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2018 Matthieu Riolo
  * All rights reserved.
  *
@@ -34 +35 @@
 #include <stdint.h>
 #include <stdio.h>
+#include <types/adt/odict.h>
 
 typedef struct {
@@ -54 +56 @@
 extern void set_iostate(iostate_t *);
 
+extern odict_t alias_dict;
+
+typedef struct {
+        odlink_t odict;
+        char *name;
+        char *value;
+} alias_t;
+
 #endif