Changeset 92574f4 in mainline for uspace/lib/c/include/stdlib.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/stdlib.h (modified) (1 diff)

uspace/lib/c/include/stdlib.h

@@ -40 +40 @@
 #include <stacktrace.h>
 
-#define abort() \
-        do { \
-                stacktrace_print(); \
-                _exit(1); \
-        } while (0)
+#define RAND_MAX  714025
 
-#define core() \
-        *((int *) 0) = 0xbadbad;
-
-#define exit(status)  _exit((status))
-
-#define RAND_MAX  714025
+#define rand()       random()
+#define srand(seed)  srandom(seed)
 
 extern long int random(void);
 extern void srandom(unsigned int seed);
 
-static inline int rand(void)
-{
-        return random();
-}
-
-static inline void srand(unsigned int seed)
-{
-        srandom(seed);
-}
+extern void abort(void) __attribute__((noreturn));
 
 #endif