Changeset 3809 for branches/libc-0.6/src/emx/include/sys

Timestamp:

Feb 16, 2014, 9:20:59 PM (12 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)
• sys/dirtree.h (modified) (1 diff)
• sys/ea.h (modified) (1 diff)
• sys/ead.h (modified) (2 diffs)
• sys/fcntl.h (modified) (1 diff)
• sys/hw.h (deleted)
• sys/process.h (modified) (2 diffs)
• sys/socket.h (modified) (2 diffs)
• sys/stat.h (modified) (1 diff)
• sys/termios.h (modified) (2 diffs)
• sys/uio.h (modified) (1 diff)
• sys/video.h (deleted)
• sys/winmgr.h (deleted)

branches/libc-0.6/src/emx/include/sys/dirtree.h

@@ -41 +41 @@
 __BEGIN_DECLS
 void    _dt_free (struct _dt_tree *dt);
-struct _dt_tree *_dt_read (__const__ char *dir, __const__ char *mask,
+struct _dt_tree *_dt_read (const char *dir, const char *mask,
     unsigned flags);
-void    _dt_sort (struct _dt_tree *dt, __const__ char *spec);
-int     _dt_split (__const__ char *src, char *dir, char *mask);
+void    _dt_sort (struct _dt_tree *dt, const char *spec);
+int     _dt_split (const char *src, char *dir, char *mask);
 __END_DECLS
 

branches/libc-0.6/src/emx/include/sys/ea.h

@@ -16 +16 @@
 
 void _ea_free (struct _ea *);
-int _ea_get (struct _ea *, __const__ char *, int, __const__ char *);
-int _ea_put (struct _ea *, __const__ char *, int, __const__ char *);
-int _ea_remove (__const__ char *, int, __const__ char *);
+int _ea_get (struct _ea *, const char *, int, const char *);
+int _ea_put (struct _ea *, const char *, int, const char *);
+int _ea_remove (const char *, int, const char *);
 
 #if defined (__cplusplus)

branches/libc-0.6/src/emx/include/sys/ead.h

@@ -12 +12 @@
 typedef struct _ead_data *_ead;
 
-int _ead_add (_ead, __const__ char *, int, __const__ void *, int);
+int _ead_add (_ead, const char *, int, const void *, int);
 void _ead_clear (_ead);
 int _ead_copy (_ead, _ead, int);
@@ -20 +20 @@
 void _ead_destroy (_ead);
 int _ead_fea2list_size (_ead);
-void *_ead_fea2list_to_fealist (__const__ void *);
-void *_ead_fealist_to_fea2list (__const__ void *);
-int _ead_find (_ead, __const__ char *);
-__const__ void *_ead_get_fea2list (_ead);
+void *_ead_fea2list_to_fealist (const void *);
+void *_ead_fealist_to_fea2list (const void *);
+int _ead_find (_ead, const char *);
+const void *_ead_get_fea2list (_ead);
 int _ead_get_flags (_ead, int);
-__const__ char *_ead_get_name (_ead, int);
-__const__ void *_ead_get_value (_ead, int);
+const char *_ead_get_name (_ead, int);
+const void *_ead_get_value (_ead, int);
 int _ead_name_len (_ead, int);
-int _ead_read (_ead, __const__ char *, int, int);
-int _ead_replace (_ead, int, int, __const__ void *, int);
+int _ead_read (_ead, const char *, int, int);
+int _ead_replace (_ead, int, int, const void *, int);
 void _ead_sort (_ead);
-int _ead_use_fea2list (_ead, __const__ void *);
+int _ead_use_fea2list (_ead, const void *);
 int _ead_value_size (_ead, int);
-int _ead_write (_ead, __const__ char *, int, int);
+int _ead_write (_ead, const char *, int, int);
 
 #if defined (__cplusplus)

branches/libc-0.6/src/emx/include/sys/fcntl.h

@@ -297 +297 @@
 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
 __BEGIN_DECLS
-int _creat (__const__ char *, int);
+int _creat (const char *, int);
 int _fcntl (int, int, ...);
 int _flock (int, int);
-int _open (__const__ char *, int, ...);
+int _open (const char *, int, ...);
 __END_DECLS
 #endif

branches/libc-0.6/src/emx/include/sys/process.h

@@ -49 +49 @@
 void abort (void)  __attribute__ ((__noreturn__));
 int atexit (void (*)(void));
-int execl (__const__ char *, __const__ char *, ...);
-int execle (__const__ char *, __const__ char *, ...);
-int execlp (__const__ char *, __const__ char *, ...);
-int execlpe (__const__ char *, __const__ char *, ...);
-int execv (__const__ char *, char * __const__ *);
-int execve (__const__ char *, char * __const__ *, char * __const__ *);
-int execvp (__const__ char *, char * __const__ *);
-int execvpe (__const__ char *, char * __const__ *, char * __const__ *);
+int execl (const char *, const char *, ...);
+int execle (const char *, const char *, ...);
+int execlp (const char *, const char *, ...);
+int execlpe (const char *, const char *, ...);
+int execv (const char *, char * const *);
+int execve (const char *, char * const *, char * const *);
+int execvp (const char *, char * const *);
+int execvpe (const char *, char * const *, char * const *);
 void exit (int) __attribute__ ((__noreturn__));
 void _exit (int) __attribute__ ((__noreturn__));
@@ -62 +62 @@
 pid_t getpid (void);
 pid_t getppid (void);
-int spawnl (int, __const__ char *, __const__ char *, ...);
-int spawnle (int, __const__ char *, __const__ char *, ...);
-int spawnlp (int, __const__ char *, __const__ char *, ...);
-int spawnlpe (int, __const__ char *, __const__ char *, ...);
-int spawnv (int, __const__ char *, char * __const__ *);
-int spawnve (int, __const__ char *, char * __const__ *, char * __const__ *);
-int spawnvp (int, __const__ char *, char * __const__ *);
-int spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
-int system (__const__ char *);
+int spawnl (int, const char *, const char *, ...);
+int spawnle (int, const char *, const char *, ...);
+int spawnlp (int, const char *, const char *, ...);
+int spawnlpe (int, const char *, const char *, ...);
+int spawnv (int, const char *, char * const *);
+int spawnve (int, const char *, char * const *, char * const *);
+int spawnvp (int, const char *, char * const *);
+int spawnvpe (int, const char *, char * const *, char * const *);
+int system (const char *);
 pid_t wait (int *);
 pid_t waitpid (pid_t, int *, int);
 
-int _execl (__const__ char *, __const__ char *, ...);
-int _execle (__const__ char *, __const__ char *, ...);
-int _execlp (__const__ char *, __const__ char *, ...);
-int _execlpe (__const__ char *, __const__ char *, ...);
-int _execv (__const__ char *, char * __const__ *);
-int _execve (__const__ char *, char * __const__ *, char * __const__ *);
-int _execvp (__const__ char *, char * __const__ *);
-int _execvpe (__const__ char *, char * __const__ *, char * __const__ *);
+int _execl (const char *, const char *, ...);
+int _execle (const char *, const char *, ...);
+int _execlp (const char *, const char *, ...);
+int _execlpe (const char *, const char *, ...);
+int _execv (const char *, char * const *);
+int _execve (const char *, char * const *, char * const *);
+int _execvp (const char *, char * const *);
+int _execvpe (const char *, char * const *, char * const *);
 int _fork (void);
 pid_t _getpid (void);
 pid_t _getppid (void);
-int _spawnl (int, __const__ char *, __const__ char *, ...);
-int _spawnle (int, __const__ char *, __const__ char *, ...);
-int _spawnlp (int, __const__ char *, __const__ char *, ...);
-int _spawnlpe (int, __const__ char *, __const__ char *, ...);
-int _spawnv (int, __const__ char *, char * __const__ *);
-int _spawnve (int, __const__ char *, char * __const__ *, char * __const__ *);
-int _spawnvp (int, __const__ char *, char * __const__ *);
-int _spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
+int _spawnl (int, const char *, const char *, ...);
+int _spawnle (int, const char *, const char *, ...);
+int _spawnlp (int, const char *, const char *, ...);
+int _spawnlpe (int, const char *, const char *, ...);
+int _spawnv (int, const char *, char * const *);
+int _spawnve (int, const char *, char * const *, char * const *);
+int _spawnvp (int, const char *, char * const *);
+int _spawnvpe (int, const char *, char * const *, char * const *);
 pid_t _wait (int *);
 pid_t _waitpid (pid_t, int *, int);

branches/libc-0.6/src/emx/include/sys/socket.h

@@ -433 +433 @@
 
 int     TCPCALL accept (int, struct sockaddr *, int *);
-int     TCPCALL bind (int, __const__ struct sockaddr *, int);
-int     TCPCALL connect (int, __const__ struct sockaddr *, int);
+int     TCPCALL bind (int, const struct sockaddr *, int);
+int     TCPCALL connect (int, const struct sockaddr *, int);
 int     TCPCALL gethostid (void);
 int     TCPCALL getpeername (int, struct sockaddr *, int *);
@@ -443 +443 @@
 int     TCPCALL recvfrom (int, void *, int, int, struct sockaddr *, int *);
 int     TCPCALL recvmsg (int, struct msghdr *, int);
-int     TCPCALL send (int, __const__ void *, int, int);
-int     TCPCALL sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
-int     TCPCALL sendmsg (int, __const__ struct msghdr *, int);
-int     TCPCALL setsockopt (int, int, int, __const__ void *, int);
+int     TCPCALL send (int, const void *, int, int);
+int     TCPCALL sendto (int, const void *, int, int, const struct sockaddr *, int);
+int     TCPCALL sendmsg (int, const struct msghdr *, int);
+int     TCPCALL setsockopt (int, int, int, const void *, int);
 int     TCPCALL shutdown (int, int);
 int     TCPCALL socket (int, int, int);

branches/libc-0.6/src/emx/include/sys/stat.h

@@ -348 +348 @@
 /* bird: emx stuff - start */
 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
-int _chmod (__const__ char *, int);
+int _chmod (const char *, int);
 int _fstat (int, struct stat *);
-int _mkdir (__const__ char *, long);
+int _mkdir (const char *, long);
 /* _mkfifo() */
-int _stat (__const__ char *, struct stat *);
+int _stat (const char *, struct stat *);
 int _umask (int);
 #endif

branches/libc-0.6/src/emx/include/sys/termios.h

@@ -142 +142 @@
 
 __BEGIN_DECLS
-speed_t cfgetispeed (__const__ struct termios *);
-speed_t cfgetospeed (__const__ struct termios *);
+speed_t cfgetispeed (const struct termios *);
+speed_t cfgetospeed (const struct termios *);
 int cfsetispeed (struct termios *, speed_t);
 int cfsetospeed (struct termios *, speed_t);
@@ -151 +151 @@
 int tcgetattr (int, struct termios *);
 int tcsendbreak (int, int);
-int tcsetattr (int, int, __const__ struct termios *);
+int tcsetattr (int, int, const struct termios *);
 
 #ifndef _POSIX_SOURCE

branches/libc-0.6/src/emx/include/sys/uio.h

@@ -75 +75 @@
 
 /* EMX versions */
-int readv (int, __const__ struct iovec *, int);
-int writev (int, __const__ struct iovec *, int);
+int readv (int, const struct iovec *, int);
+int writev (int, const struct iovec *, int);
 
 #if defined (__cplusplus)