Changeset 92574f4 in mainline for uspace/lib/c/include/syscall.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/include/syscall.h (modified) (3 diffs)

uspace/lib/c/include/syscall.h

@@ -32 +32 @@
 /**
  * @file
- * @brief       Syscall function declaration for architectures that don't
- *              inline syscalls or architectures that handle syscalls
- *              according to the number of arguments.
+ * @brief Syscall function declaration for architectures that don't
+ *        inline syscalls or architectures that handle syscalls
+ *        according to the number of arguments.
  */
 
@@ -40 +40 @@
 #define LIBC_SYSCALL_H_
 
-#ifndef LIBARCH_SYSCALL_GENERIC
-#error "You can't include this file directly."
+#ifndef LIBARCH_SYSCALL_GENERIC
+        #error You cannot include this file directly
 #endif
 
@@ -47 +47 @@
 #include <kernel/syscall/syscall.h>
 
-#define __syscall0      __syscall
-#define __syscall1      __syscall
-#define __syscall2      __syscall
-#define __syscall3      __syscall
-#define __syscall4      __syscall
-#define __syscall5      __syscall
-#define __syscall6      __syscall
+#define __syscall0  __syscall
+#define __syscall1  __syscall
+#define __syscall2  __syscall
+#define __syscall3  __syscall
+#define __syscall4  __syscall
+#define __syscall5  __syscall
+#define __syscall6  __syscall
 
 extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2,