Changeset 3809 for branches/libc-0.6/src/emx/include/string.h

Timestamp:

Feb 16, 2014, 9:20:59 PM (11 years ago)

Author:

bird

Message:

0.6: s/const/const/g - just use the (now) standard 'const' everywhere in emx and kLIBC code. Avoid changing external code too much. fixes #279.

Location:

branches/libc-0.6/src/emx/include

Files:

• . (modified) (1 prop)
• string.h (modified) (4 diffs)

branches/libc-0.6/src/emx/include/string.h

@@ -130 +130 @@
 #define _MEMDIF_EQ 0xffffffff
 #endif
-int     memicmp(__const__ void *, __const__ void *, size_t);
-int     stricmp(__const__ char *, __const__ char *);
+int     memicmp(const void *, const void *, size_t);
+int     stricmp(const char *, const char *);
 char *  strlwr(char *);
-int     strnicmp(__const__ char *, __const__ char *, size_t);
+int     strnicmp(const char *, const char *, size_t);
 char *  strnset(char *, int, size_t);
 char *  strrev(char *);
@@ -141 +141 @@
 
 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
-size_t _memcount (__const__ void *, int, size_t);
-size_t _memdif (__const__ void *, __const__ void *, size_t);
+size_t _memcount (const void *, int, size_t);
+size_t _memdif (const void *, const void *, size_t);
 void *_memrchr (const void *, int, size_t);
 void _memswap (void *, void *, size_t);
-char *_strncpy (char *, __const__ char *, size_t);
-void *_memccpy (void *, __const__ void *, int, size_t);
-int _memicmp (__const__ void *, __const__ void *, size_t);
-char *_strdup (__const__ char *);
-int _stricmp (__const__ char *, __const__ char *);
+char *_strncpy (char *, const char *, size_t);
+void *_memccpy (void *, const void *, int, size_t);
+int _memicmp (const void *, const void *, size_t);
+char *_strdup (const char *);
+int _stricmp (const char *, const char *);
 char *_strlwr (char *);
-int _strnicmp (__const__ char *, __const__ char *, size_t);
+int _strnicmp (const char *, const char *, size_t);
 char *_strnset (char *, int, size_t);
 char *_strrev (char *);
 char *_strset (char *, int);
 char *_strupr (char *);
-char *_strsep (char **, __const__ char *);
+char *_strsep (char **, const char *);
 #endif
 
@@ -194 +194 @@
 #define strdupa(psz) \
     (__extension__({ \
-        __const__ char *__pszInput = (psz); \
+        const char *__pszInput = (psz); \
         size_t          __cchInput = strlen(__pszInput) + 1; \
         char           *__pszReturn = __builtin_alloca(__cchInput); \
@@ -202 +202 @@
 #define strndupa(psz, cch) \
     (__extension__({ \
-        __const__ char *__pszInput = (psz); \
+        const char *__pszInput = (psz); \
         size_t          __cchInput = strnlen(__pszInput, (cch)); \
         char           *__pszReturn = __builtin_alloca(__cchInput + 1); \