Context Navigation

← Previous Change
Next Change →

Changeset d5a89a3 in mainline for uspace/lib/c/include/ipc

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

Location:

uspace/lib/c/include/ipc

Files:

: 36 edited

adb.h (modified) (1 diff)
bd.h (modified) (1 diff)
chardev.h (modified) (1 diff)
clipboard.h (modified) (1 diff)
common.h (modified) (1 diff)
console.h (modified) (1 diff)
corecfg.h (modified) (1 diff)
dev_iface.h (modified) (1 diff)
devman.h (modified) (1 diff)
dhcp.h (modified) (1 diff)
dnsr.h (modified) (1 diff)
event.h (modified) (1 diff)
graph.h (modified) (1 diff)
inet.h (modified) (1 diff)
input.h (modified) (1 diff)
ipc.h (modified) (1 diff)
ipc_test.h (modified) (1 diff)
iplink.h (modified) (1 diff)
irc.h (modified) (1 diff)
irq.h (modified) (1 diff)
kbdev.h (modified) (1 diff)
loader.h (modified) (1 diff)
loc.h (modified) (1 diff)
logger.h (modified) (1 diff)
mouseev.h (modified) (1 diff)
ns.h (modified) (1 diff)
output.h (modified) (1 diff)
pci.h (modified) (1 diff)
serial_ctl.h (modified) (1 diff)
services.h (modified) (1 diff)
tcp.h (modified) (1 diff)
udp.h (modified) (1 diff)
vbd.h (modified) (1 diff)
vfs.h (modified) (1 diff)
vol.h (modified) (1 diff)
window.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_ADB_H_
 #define LIBC_IPC_ADB_H_
+#ifndef _LIBC_IPC_ADB_H_
+#define _LIBC_IPC_ADB_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_BD_H_
 #define LIBC_IPC_BD_H_
+#ifndef _LIBC_IPC_BD_H_
+#define _LIBC_IPC_BD_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_CHARDEV_H_
 #define LIBC_IPC_CHARDEV_H_
+#ifndef _LIBC_IPC_CHARDEV_H_
+#define _LIBC_IPC_CHARDEV_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_CLIPBOARD_H_
 #define LIBC_IPC_CLIPBOARD_H_
+#ifndef _LIBC_IPC_CLIPBOARD_H_
+#define _LIBC_IPC_CLIPBOARD_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_COMMON_H_
 #define LIBC_IPC_COMMON_H_
+#ifndef _LIBC_IPC_COMMON_H_
+#define _LIBC_IPC_COMMON_H_
 #include <types/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_CONSOLE_H_
 #define LIBC_IPC_CONSOLE_H_
+#ifndef _LIBC_IPC_CONSOLE_H_
+#define _LIBC_IPC_CONSOLE_H_
 #include <ipc/vfs.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_CORECFG_H_
 #define LIBC_IPC_CORECFG_H_
+#ifndef _LIBC_IPC_CORECFG_H_
+#define _LIBC_IPC_CORECFG_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_DEV_IFACE_H_
 #define LIBC_IPC_DEV_IFACE_H_
+#ifndef _LIBC_IPC_DEV_IFACE_H_
+#define _LIBC_IPC_DEV_IFACE_H_
 #include <stdlib.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_DEVMAN_H_
 #define LIBC_IPC_DEVMAN_H_
+#ifndef _LIBC_IPC_DEVMAN_H_
+#define _LIBC_IPC_DEVMAN_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_DHCP_H_
 #define LIBC_IPC_DHCP_H_
+#ifndef _LIBC_IPC_DHCP_H_
+#define _LIBC_IPC_DHCP_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_DNSR_H_
 #define LIBC_IPC_DNSR_H_
+#ifndef _LIBC_IPC_DNSR_H_
+#define _LIBC_IPC_DNSR_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_EVENT_H_
 #define LIBC_IPC_EVENT_H_
+#ifndef _LIBC_IPC_EVENT_H_
+#define _LIBC_IPC_EVENT_H_
 #include <abi/ipc/event.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_GRAPH_H_
 #define LIBC_IPC_GRAPH_H_
+#ifndef _LIBC_IPC_GRAPH_H_
+#define _LIBC_IPC_GRAPH_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_INET_H_
 #define LIBC_IPC_INET_H_
+#ifndef _LIBC_IPC_INET_H_
+#define _LIBC_IPC_INET_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_INPUT_H_
 #define LIBC_IPC_INPUT_H_
+#ifndef _LIBC_IPC_INPUT_H_
+#define _LIBC_IPC_INPUT_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #if ((defined(LIBC_ASYNC_H_)) && (!defined(LIBC_ASYNC_C_)))
+#if ((defined(_LIBC_ASYNC_H_)) && (!defined(_LIBC_ASYNC_C_)))
 #error Do not intermix low-level IPC interface and async framework
 #endif
 #ifndef LIBC_IPC_H_
 #define LIBC_IPC_H_
+#ifndef _LIBC_IPC_H_
+#define _LIBC_IPC_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_IPC_TEST_H_
 #define LIBC_IPC_IPC_TEST_H_
+#ifndef _LIBC_IPC_IPC_TEST_H_
+#define _LIBC_IPC_IPC_TEST_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_IPLINK_H_
 #define LIBC_IPC_IPLINK_H_
+#ifndef _LIBC_IPC_IPLINK_H_
+#define _LIBC_IPC_IPLINK_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_IRC_H_
 #define LIBC_IPC_IRC_H_
+#ifndef _LIBC_IPC_IRC_H_
+#define _LIBC_IPC_IRC_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_IRQ_H_
 #define LIBC_IPC_IRQ_H_
+#ifndef _LIBC_IPC_IRQ_H_
+#define _LIBC_IPC_IRQ_H_
 #include <types/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_KBDEV_H_
 #define LIBC_IPC_KBDEV_H_
+#ifndef _LIBC_IPC_KBDEV_H_
+#define _LIBC_IPC_KBDEV_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_LOADER_H_
 #define LIBC_IPC_LOADER_H_
+#ifndef _LIBC_IPC_LOADER_H_
+#define _LIBC_IPC_LOADER_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_LOC_H_
 #define LIBC_IPC_LOC_H_
+#ifndef _LIBC_IPC_LOC_H_
+#define _LIBC_IPC_LOC_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_LOGGER_H_
 #define LIBC_IPC_LOGGER_H_
+#ifndef _LIBC_IPC_LOGGER_H_
+#define _LIBC_IPC_LOGGER_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_MOUSEEV_H_
 #define LIBC_IPC_MOUSEEV_H_
+#ifndef _LIBC_IPC_MOUSEEV_H_
+#define _LIBC_IPC_MOUSEEV_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_NS_H_
 #define LIBC_IPC_NS_H_
+#ifndef _LIBC_IPC_NS_H_
+#define _LIBC_IPC_NS_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_OUTPUT_H_
 #define LIBC_IPC_OUTPUT_H_
+#ifndef _LIBC_IPC_OUTPUT_H_
+#define _LIBC_IPC_OUTPUT_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_PCI_H_
 #define LIBC_IPC_PCI_H_
+#ifndef _LIBC_IPC_PCI_H_
+#define _LIBC_IPC_PCI_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_SERIAL_CTL_H_
 #define LIBC_IPC_SERIAL_CTL_H_
+#ifndef _LIBC_IPC_SERIAL_CTL_H_
+#define _LIBC_IPC_SERIAL_CTL_H_
 #include <ipc/chardev.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_SERVICES_H_
 #define LIBC_SERVICES_H_
+#ifndef _LIBC_SERVICES_H_
+#define _LIBC_SERVICES_H_
 #include <abi/fourcc.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_TCP_H_
 #define LIBC_IPC_TCP_H_
+#ifndef _LIBC_IPC_TCP_H_
+#define _LIBC_IPC_TCP_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_UDP_H_
 #define LIBC_IPC_UDP_H_
+#ifndef _LIBC_IPC_UDP_H_
+#define _LIBC_IPC_UDP_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_VBD_H_
 #define LIBC_IPC_VBD_H_
+#ifndef _LIBC_IPC_VBD_H_
+#define _LIBC_IPC_VBD_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_VFS_H_
 #define LIBC_IPC_VFS_H_
+#ifndef _LIBC_IPC_VFS_H_
+#define _LIBC_IPC_VFS_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_VOL_H_
 #define LIBC_IPC_VOL_H_
+#ifndef _LIBC_IPC_VOL_H_
+#define _LIBC_IPC_VOL_H_
 #include <ipc/common.h>

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

-              re3272101
+              rd5a89a3
  */
 #ifndef LIBC_IPC_WINDOW_H_
 #define LIBC_IPC_WINDOW_H_
+#ifndef _LIBC_IPC_WINDOW_H_
+#define _LIBC_IPC_WINDOW_H_
 #include <ipc/vfs.h>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset d5a89a3 in mainline for uspace/lib/c/include/ipc

Legend:

Download in other formats: