Changeset 3809 for branches/libc-0.6/src/emx/include/stdlib.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)
• stdlib.h (modified) (4 diffs)

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

@@ -369 +369 @@
 extern char **environ;
 
-extern __const__ unsigned char _osminor;
-extern __const__ unsigned char _osmajor;
+extern const unsigned char _osminor;
+extern const unsigned char _osmajor;
 
 /* No DOS support ... */
@@ -401 +401 @@
 
 extern char **_environ;
-extern __const__ char * __const__ _sys_errlist[];
-extern __const__ int _sys_nerr;
+extern const char * const _sys_errlist[];
+extern const int _sys_nerr;
 
 unsigned _alarm (unsigned);
 int _brk(const void *);
-int _chdir (__const__ char *);
+int _chdir (const char *);
 char *_gcvt (double, int, char *);
 char *_getcwd (char *, size_t);
 int _getpagesize (void);
 char *_getwd (char *);
-int _mkdir (__const__ char *, long);
-int _putenv (__const__ char *);
-int _rmdir (__const__ char *);
+int _mkdir (const char *, long);
+int _putenv (const char *);
+int _rmdir (const char *);
 void *_sbrk(intptr_t);
 unsigned _sleep (unsigned);
-void _swab (__const__ void *, void *, size_t);
+void _swab (const void *, void *, size_t);
 long _ulimit (int, ...);
 
-int _abspath (char *, __const__ char *, int);
-long long _atoll (__const__ char *);
-long double _atofl (__const__ char *);
-int _chdir2 (__const__ char *);
+int _abspath (char *, const char *, int);
+long long _atoll (const char *);
+long double _atofl (const char *);
+int _chdir2 (const char *);
 int _chdir_os2 (const char *);
 int _chdrive (int);
 int _core (int);
-void _defext (char *, __const__ char *);
-void _envargs (int *, char ***, __const__ char *);
+void _defext (char *, const char *);
+void _envargs (int *, char ***, const char *);
 int _execname (char *, size_t);
 void _exit (int) __attribute__ ((__noreturn__));
-int _filesys (__const__ char *, char *, size_t);
-char **_fnexplode (__const__ char *);
+int _filesys (const char *, char *, size_t);
+char **_fnexplode (const char *);
 void _fnexplodefree (char **);
-char _fngetdrive (__const__ char *);
-int _fnisabs (__const__ char *);
-int _fnisrel (__const__ char *);
+char _fngetdrive (const char *);
+int _fnisabs (const char *);
+int _fnisrel (const char *);
 void _fnlwr (char *);
-void _fnlwr2 (char *, __const__ char *);
+void _fnlwr2 (char *, const char *);
 char *_fnslashify (char *);
-int _fullpath (char *, __const__ char *, int);
+int _fullpath (char *, const char *, int);
 int _getcwd1 (char *, char);
 char *_getcwd2 (char *, int);
 int _getdrive (void);
-char *_getext (__const__ char *);
-char *_getext2 (__const__ char *);
-char *_getname (__const__ char *);
+char *_getext (const char *);
+char *_getext2 (const char *);
+char *_getname (const char *);
 int _getsockhandle (int);
 int _gettid (void);
@@ -459 +459 @@
 char *_lltoa (long long, char *, int);
 char *_ulltoa (unsigned long long, char *, int);
-void _makepath (char *, __const__ char *, __const__ char *,
-    __const__ char *, __const__ char *);
-int _path (char *, __const__ char *);
+void _makepath (char *, const char *, const char *,
+    const char *, const char *);
+int _path (char *, const char *);
 int _read_kbd (int, int, int);
 void _remext (char *);
@@ -467 +467 @@
 void _response (int *, char ***);
 void _scrsize (int *);
-void _searchenv (__const__ char *, __const__ char *, char *);
-void _sfnlwr (__const__ char *);
+void _searchenv (const char *, const char *, char *);
+void _sfnlwr (const char *);
 unsigned _sleep2 (unsigned);
 char ** _splitargs (char *, int *);
-void _splitpath (__const__ char *, char *, char *, char *, char *);
-float _strtof (__const__ char *, char **);
-long double _strtold (__const__ char *, char **);
-long long _strtoll (__const__ char *, char **, int);
-unsigned long long _strtoull (__const__ char *, char **, int);
+void _splitpath (const char *, char *, char *, char *, char *);
+float _strtof (const char *, char **);
+long double _strtold (const char *, char **);
+long long _strtoll (const char *, char **, int);
+unsigned long long _strtoull (const char *, char **, int);
 char _swchar (void);
 void _wildcard (int *, char ***);