Changeset 4d10fc8 in mainline

Timestamp:

2011-06-07T17:16:38Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

acc3f82c

Parents:

2fc5072

Message:

Add LIBPOSIX_INTERNAL macro to avoid unnecessary undefines

Location:

uspace/lib/posix

Files:

• stdlib.c (modified) (1 diff)
• stdlib.h (modified) (1 diff)
• string.c (modified) (2 diffs)
• string.h (modified) (1 diff)
• time.c (modified) (1 diff)
• time.h (modified) (1 diff)

uspace/lib/posix/stdlib.c

@@ -33 +33 @@
  */
 
-#undef qsort
+#define LIBPOSIX_INTERNAL
 
-#undef getenv
-
-#undef realpath
+#include "stdlib.h"
 
 /**

uspace/lib/posix/stdlib.h

@@ -56 +56 @@
 extern char *posix_realpath(const char *restrict name, char *restrict resolved);
 
+#ifndef LIBPOSIX_INTERNAL
+        #define qsort posix_qsort
+        #define getenv posix_getenv
+        #define realpath posix_realpath
+#endif
+
 #endif  // POSIX_STDLIB_H_
 

uspace/lib/posix/string.c

@@ -34 +34 @@
  */
 
+#define LIBPOSIX_INTERNAL
+
 #include "string.h"
 
@@ -39 +41 @@
 
 #include <str_error.h>
-
-#undef strcpy
-#undef strncpy
-#undef strcat
-#undef strncat
-#undef mempcpy
-#undef strdup
-
-#undef memcmp
-#undef strcmp
-#undef strncmp
-#undef strcasecmp
-#undef strncasecmp
-
-#undef memchr
-#undef rawmemchr
-#undef strchr
-#undef strrchr
-#undef strpbrk
-#undef strcspn
-#undef strspn
-#undef strstr
-
-#undef strcoll
-#undef strxfrm
-
-#undef strerror
-
-#undef strlen
 
 /**

uspace/lib/posix/string.h

@@ -79 +79 @@
 extern size_t posix_strlen(const char *s);
 
-#define strcpy posix_strcpy
-#define strncpy posix_strncpy
-#define strcat posix_strcat
-#define strncat posix_strncat
-#define mempcpy posix_mempcpy
-#define strdup posix_strdup
+#ifndef LIBPOSIX_INTERNAL
+        #define strcpy posix_strcpy
+        #define strncpy posix_strncpy
+        #define strcat posix_strcat
+        #define strncat posix_strncat
+        #define mempcpy posix_mempcpy
+        #define strdup posix_strdup
 
-#define memcmp posix_memcmp
-#define strcmp posix_strcmp
-#define strncmp posix_strncmp
-#define strcasecmp posix_strcasecmp
-#define strncasecmp posix_strncasecmp
+        #define memcmp posix_memcmp
+        #define strcmp posix_strcmp
+        #define strncmp posix_strncmp
+        #define strcasecmp posix_strcasecmp
+        #define strncasecmp posix_strncasecmp
 
-#define memchr posix_memchr
-#define rawmemchr posix_rawmemchr
-#define strchr posix_strchr
-#define strrchr posix_strrchr
-#define strpbrk posix_strpbrk
-#define strcspn posix_strcspn
-#define strspn posix_strspn
-#define strstr posix_strstr
+        #define memchr posix_memchr
+        #define rawmemchr posix_rawmemchr
+        #define strchr posix_strchr
+        #define strrchr posix_strrchr
+        #define strpbrk posix_strpbrk
+        #define strcspn posix_strcspn
+        #define strspn posix_strspn
+        #define strstr posix_strstr
 
-#define strcoll posix_strcoll
-#define strxfrm posix_strxfrm
+        #define strcoll posix_strcoll
+        #define strxfrm posix_strxfrm
 
-#define strerror posix_strerror
+        #define strerror posix_strerror
 
-#define strlen posix_strlen
+        #define strlen posix_strlen
+#endif
 
 #endif  // POSIX_STRING_H_

uspace/lib/posix/time.c

@@ -34 +34 @@
  */
 
+#define LIBPOSIX_INTERNAL
+
 #include "time.h"
-
-#undef tm
-
-#undef localtime
-
-#undef asctime
-#undef ctime
-#undef strftime
 
 /**

uspace/lib/posix/time.h

@@ -63 +63 @@
 extern size_t posix_strftime(char *restrict s, size_t maxsize, const char *restrict format, const struct posix_tm *restrict tm);
 
-#define tm posix_tm
+#ifndef LIBPOSIX_INTERNAL
+        #define tm posix_tm
 
-#define localtime posix_localtime
+        #define localtime posix_localtime
 
-#define asctime posix_asctime
-#define ctime posix_ctime
-#define strftime posix_strftime
+        #define asctime posix_asctime
+        #define ctime posix_ctime
+        #define strftime posix_strftime
+#endif
 
 #endif  // POSIX_TIME_H_