Changeset 2b3dd78 in mainline for uspace/lib/c/include/ipc

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:

uspace/lib/c/include/ipc

Files:

• devman.h (modified) (1 diff)
• ipc.h (modified) (1 diff)
• logger.h (modified) (1 diff)

uspace/lib/c/include/ipc/devman.h

@@ -74 +74 @@
         /** Id of device model.
          */
-        const char *id;
+        char *id;
         /** Relevancy of device-to-driver match.
          * The higher is the product of scores specified for the device by the bus driver and by the leaf driver,

uspace/lib/c/include/ipc/ipc.h

@@ -34 +34 @@
 
 #if ((defined(LIBC_ASYNC_H_)) && (!defined(LIBC_ASYNC_C_)))
-        #error Do not intermix low-level IPC interface and async framework
+#error Do not intermix low-level IPC interface and async framework
 #endif
 

uspace/lib/c/include/ipc/logger.h

@@ -54 +54 @@
          * Returns: error code
          * Followed by: vfs_pass_handle() request.
-         */ 
+         */
         LOGGER_CONTROL_SET_ROOT
 } logger_control_request_t;