Changeset 3809 for branches/libc-0.6


Ignore:
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:
3 deleted
32 edited

Legend:

Unmodified
Added
Removed

  • branches/libc-0.6/src/emx/include

  • branches/libc-0.6/src/emx/include/InnoTekLIBC

  • branches/libc-0.6/src/emx/include/InnoTekLIBC/tcpip.h

    r2004 r3809  
    150150 * @{ */
    151151int     _System __libsocket_accept(int, struct sockaddr *, int *);
    152 int     _System __libsocket_bind(int, __const__ struct sockaddr *, int);
    153 int     _System __libsocket_connect(int, __const__ struct sockaddr *, int);
     152int     _System __libsocket_bind(int, const struct sockaddr *, int);
     153int     _System __libsocket_connect(int, const struct sockaddr *, int);
    154154int     _System __libsocket_getpeername(int, struct sockaddr *, int *);
    155155int     _System __libsocket_getsockname(int, struct sockaddr *, int *);
    … …  
    163163int     _System __libsocket_recvmsg(int, struct msghdr *, int);
    164164int     _System __libsocket_send(int, const void *, int, int);
    165 int     _System __libsocket_sendmsg(int, __const__ struct msghdr *, int);
    166 int     _System __libsocket_sendto(int, __const__ void *, int, int, __const__ struct sockaddr *, int);
    167 int     _System __libsocket_setsockopt(int, int, int, __const__ void *, int);
     165int     _System __libsocket_sendmsg(int, const struct msghdr *, int);
     166int     _System __libsocket_sendto(int, const void *, int, int, const struct sockaddr *, int);
     167int     _System __libsocket_setsockopt(int, int, int, const void *, int);
    168168int     _System __libsocket_shutdown(int, int);
    169169int     _System __libsocket_sock_errno(void);

  • branches/libc-0.6/src/emx/include/arpa/inet.h

    r1739 r3809  
    7272#endif
    7373
    74 extern u_long   TCPCALL inet_addr(__const__ char*);
     74extern u_long   TCPCALL inet_addr(const char*);
    7575extern u_long   TCPCALL inet_lnaof(struct in_addr);
    7676extern struct in_addr TCPCALL inet_makeaddr(u_long, u_long);
    7777extern u_long   TCPCALL inet_netof(struct in_addr);
    78 extern u_long   TCPCALL inet_network(__const__ char*);
     78extern u_long   TCPCALL inet_network(const char*);
    7979extern char*    TCPCALL inet_ntoa(struct in_addr);
    8080

  • branches/libc-0.6/src/emx/include/arpa/nameser.h

    r2992 r3809  
    368368void    TCPCALL putshort(u_short, u_char *);
    369369void    TCPCALL putlong(u_long, u_char *);
    370 int     TCPCALL dn_expand(__const__ u_char*, __const__ u_char*, __const__ u_char*, u_char*, int);
    371 int     TCPCALL dn_comp(__const__ u_char*, u_char*, int, u_char**, u_char**);
     370int     TCPCALL dn_expand(const u_char*, const u_char*, const u_char*, u_char*, int);
     371int     TCPCALL dn_comp(const u_char*, u_char*, int, u_char**, u_char**);
    372372int     TCPCALL dn_find(u_char*, u_char*, u_char**, u_char**);
    373 int     TCPCALL dn_skipname(__const__ u_char*, __const__ u_char*);
     373int     TCPCALL dn_skipname(const u_char*, const u_char*);
    374374int     TCPCALL res_init(void);
    375 int     TCPCALL res_mkquery(int, __const__ char*, int, int, __const__ char*, int, __const__ struct rrec*, char*, int);
    376 int     TCPCALL res_send(__const__ char*, int, char*, int);
     375int     TCPCALL res_mkquery(int, const char*, int, int, const char*, int, const struct rrec*, char*, int);
     376int     TCPCALL res_send(const char*, int, char*, int);
    377377int     TCPCALL res_query(char*, int, int, u_char*, int);
    378378int     TCPCALL res_search(char*, int, int, u_char*, int);

  • branches/libc-0.6/src/emx/include/assert.h

    r1506 r3809  
    1313#define assert(exp) ((void)0)
    1414#else
    15 void _assert (__const__ char *, __const__ char *, unsigned);
     15void _assert (const char *, const char *, unsigned);
    1616#define assert(exp) ((exp) ? (void)0 : _assert (#exp, __FILE__, __LINE__))
    1717#endif

  • branches/libc-0.6/src/emx/include/direct.h

    r1674 r3809  
    4545__BEGIN_DECLS
    4646
    47 int _chdir (__const__ char *);
     47int _chdir (const char *);
    4848char *_getcwd (char *, size_t);
    49 int _mkdir (__const__ char *, long);
    50 int _rmdir (__const__ char *);
     49int _mkdir (const char *, long);
     50int _rmdir (const char *);
    5151
    5252int chdir (const char *);

  • branches/libc-0.6/src/emx/include/dirent.h

    r2424 r3809  
    150150
    151151/* bird: EMX extra - start */
    152 DIR *_opendir (__const__ char *);
     152DIR *_opendir (const char *);
    153153struct dirent *_readdir (DIR *);
    154154void _seekdir (DIR *, long);

  • branches/libc-0.6/src/emx/include/emx/fnmatch.h

    r3779 r3809  
    1616#define FNM_PERIOD         64
    1717
    18 int fnmatch (__const__ char *, __const__ char *, int);
     18int fnmatch (const char *, const char *, int);
    1919
    2020
    … …  
    3535#define _FNM_PATHPREFIX    256
    3636
    37 int _fnmatch (__const__ char *, __const__ char *, int);
     37int _fnmatch (const char *, const char *, int);
    3838
    3939#endif

  • branches/libc-0.6/src/emx/include/emx/getopt.h

    r930 r3809  
    2525   array pointed to. */
    2626
    27 int _emx_getopt (int, char **, __const__ char *);
     27int _emx_getopt (int, char **, const char *);
    2828
    2929#if defined (__cplusplus)

  • branches/libc-0.6/src/emx/include/emx/io.h

    r3695 r3809  
    552552#define _fd_init(a)         please do not use this use this! ##a
    553553#define _fd_lookahead(a)    please do not use this use this! ##a
    554 struct __sFILE *_openstream (struct __sFILE *, __const__ char *, __const__ char *,
     554struct __sFILE *_openstream (struct __sFILE *, const char *, const char *,
    555555    int, int);
    556556int _flushstream (struct __sFILE *, int);
    … …  
    558558int _fseek_unlocked (struct __sFILE *, off_t, int);
    559559off_t _ftello_unlocked (struct __sFILE *);
    560 int _input (struct __sFILE *, __const__ char *, char *);
     560int _input (struct __sFILE *, const char *, char *);
    561561struct __sFILE *_newstream (void);
    562 int _output (struct __sFILE *, __const__ char *, char *);
     562int _output (struct __sFILE *, const char *, char *);
    563563int _stream_read (int, void *, size_t);
    564 int _stream_write (int, __const__ void *, size_t);
     564int _stream_write (int, const void *, size_t);
    565565int _tmpbuf1 (struct __sFILE *, void *);
    566 int _trslash (__const__ char *, size_t, int);
     566int _trslash (const char *, size_t, int);
    567567int _ungetc_nolock (int, struct __sFILE *);
    568 int _vsopen (__const__ char *, int, int, char *);
     568int _vsopen (const char *, int, int, char *);
    569569
    570570

  • branches/libc-0.6/src/emx/include/emx/pwd.h

    r18 r3809  
    1010struct passwd;
    1111
    12 struct passwd *_getpw (int, __const__ char *);
     12struct passwd *_getpw (int, const char *);
    1313
    1414

  • branches/libc-0.6/src/emx/include/emx/syscalls.h

    r2439 r3809  
    106106{
    107107  int handle;
    108   __const__ void *buf;
     108  const void *buf;
    109109  int len;
    110110  unsigned flags;
    111   __const__ struct sockaddr *to;
     111  const struct sockaddr *to;
    112112  int tolen;
    113113};
    … …  
    116116//dead int __accept (int handle, struct sockaddr *addr, int *paddrlen);
    117117unsigned __alarm (unsigned sec);
    118 //dead int __bind (int handle, __const__ struct sockaddr *addr, int addrlen);
     118//dead int __bind (int handle, const struct sockaddr *addr, int addrlen);
    119119void *__brk (void *addr);
    120120void __cgets (char *buffer);
    121 //dead int __chdir (__const__ char *name);
    122 int __chmod (__const__ char *name, int flag, int attr);
     121//dead int __chdir (const char *name);
     122int __chmod (const char *name, int flag, int attr);
    123123int __chdrive (char drive);
    124124//dead int __chsize (int handle, off_t length);
    125125long long __clock (void);
    126126int __close (int handle);
    127 //dead int __connect (int handle, __const__ struct sockaddr *addr, int addrlen);
     127//dead int __connect (int handle, const struct sockaddr *addr, int addrlen);
    128128int __core (int handle);
    129129int __dup (int handle);
    … …  
    133133void __exit (int ret) __attribute__ ((__noreturn__));
    134134/*int __fcntl (int handle, int request, int arg);*/
    135 int __filesys (__const__ char *drive, char *name, size_t size);
    136 int __findfirst (__const__ char *name, int attr, struct _find *fp);
     135int __filesys (const char *drive, char *name, size_t size);
     136int __findfirst (const char *name, int attr, struct _find *fp);
    137137int __findnext (struct _find *fp);
    138138int __fork (void);
    … …  
    143143//dead int __getcwd (char *buffer, char drive);
    144144char __getdrive (void);
    145 //dead int __gethostbyaddr (__const__ char *addr, int len, int type,
     145//dead int __gethostbyaddr (const char *addr, int len, int type,
    146146//dead     struct hostent **dst);
    147 //dead int __gethostbyname (__const__ char *name, struct hostent **dst);
     147//dead int __gethostbyname (const char *name, struct hostent **dst);
    148148//dead int __gethostid (int *dst);
    149149//dead int __gethostname (char *name, int len);
    150 //dead int __getnetbyname (__const__ char *name, struct netent **dst);
     150//dead int __getnetbyname (const char *name, struct netent **dst);
    151151//dead int __getnetbyaddr (long net, struct netent **dst);
    152152//dead int __getpeername (int handle, struct sockaddr *name, int *pnamelen);
    153153int __getpid (void);
    154154int __getppid (void);
    155 //dead int __getprotobyname (__const__ char *name, struct protoent **dst);
     155//dead int __getprotobyname (const char *name, struct protoent **dst);
    156156//dead int __getprotobynumber (int prot, struct protoent **dst);
    157 //dead int __getservbyname (__const__ char *name, __const__ char *proto,
     157//dead int __getservbyname (const char *name, const char *proto,
    158158//dead     struct servent **dst);
    159 //dead int __getservbyport (int port, __const__ char *proto, struct servent **dst);
     159//dead int __getservbyport (int port, const char *proto, struct servent **dst);
    160160//dead int __getsockhandle (int handle);
    161161//dead int __getsockname (int handle, struct sockaddr *name, int *pnamelen);
    … …  
    170170//dead off_t __lseek (int handle, off_t offset, int origin);
    171171int __memavail (void);
    172 //dead int __mkdir (__const__ char *name);
     172//dead int __mkdir (const char *name);
    173173int __newthread (int tid);
    174174struct __libc_FileHandle;
    175 //dead int __open (__const__ char *name, int flags, off_t size, mode_t cmode, unsigned fLibc, struct __libc_FileHandle **pFH);
     175//dead int __open (const char *name, int flags, off_t size, mode_t cmode, unsigned fLibc, struct __libc_FileHandle **pFH);
    176176int __pause (void);
    177177int __pipe(int *two_handles, int pipe_size, struct __libc_FileHandle **ppFHRead, struct __libc_FileHandle **ppFHWrite);
    178 int __profil (__const__ struct _profil *p);
     178int __profil (const struct _profil *p);
    179179int __ptrace (int request, int pid, int addr, int data);
    180180int __raise (int sig);
    … …  
    182182int __read_kbd (int echo, int wait, int sig);
    183183int __recv (int handle, void *buf, int len, unsigned flags);
    184 int __recvfrom (__const__ struct _recvfrom *args);
    185 int __remove (__const__ char *name);
    186 int __rename (__const__ char *old_name, __const__ char *new_name);
    187 //dead int __rmdir (__const__ char *name);
     184int __recvfrom (const struct _recvfrom *args);
     185int __remove (const char *name);
     186int __rename (const char *old_name, const char *new_name);
     187//dead int __rmdir (const char *name);
    188188void *__sbrk (int incr);
    189189void __scrsize (int *dst);
    190190int __select(int nfds, struct fd_set *readfds, struct fd_set *writefds,
    191191             struct fd_set *exceptfds, struct timeval *tv);
    192 //dead int __send (int handle, __const__ void *buf, int len, unsigned flags);
    193 //dead int __sendto (__const__ struct _sendto *args);
    194 //dead int __setsockopt (int handle, int level, int optname, __const__ void *optval,
     192//dead int __send (int handle, const void *buf, int len, unsigned flags);
     193//dead int __sendto (const struct _sendto *args);
     194//dead int __setsockopt (int handle, int level, int optname, const void *optval,
    195195//dead     int optlen);
    196196int __settime (const struct timeval *tp);
    197197//dead int __shutdown (int handle, int how);
    198 int __sigaction (int _sig, __const__ struct sigaction *_iact,
     198int __sigaction (int _sig, const struct sigaction *_iact,
    199199    struct sigaction *_oact);
    200200void (*__signal (int sig, void (*handler)()))(int sig);
    201201int __sigpending (sigset_t *_set);
    202 int __sigprocmask (int _how, __const__ sigset_t *_iset, sigset_t *_oset);
    203 int __sigsuspend (__const__ sigset_t *_mask);
     202int __sigprocmask (int _how, const sigset_t *_iset, sigset_t *_oset);
     203int __sigsuspend (const sigset_t *_mask);
    204204unsigned __sleep (unsigned sec);
    205205unsigned __sleep2 (unsigned millisec);
    206206//dead int __socket (int domain, int type, int protocol);
    207207int __spawnve (struct _new_proc *np);
    208 //dead int __stat (__const__ char *name, struct stat *buffer);
     208//dead int __stat (const char *name, struct stat *buffer);
    209209int __swchar (int flag, int new_char);
    210210int __uflags (int mask, int new_flags);
    … …  
    212212//dead int __umask (int pmode);
    213213void __unwind2 (void *xcpt_reg_ptr);
    214 int __utimes (__const__ char *name, __const__ struct timeval *tvp);
     214int __utimes (const char *name, const struct timeval *tvp);
    215215int __ttyname (int handle, char *buf, size_t buf_size);
    216216int __wait (int *status);
    217217int __waitpid (int pid, int *status, int options);
    218 int __write (int handle, __const__ void *buf, size_t nbyte);
     218int __write (int handle, const void *buf, size_t nbyte);
    219219
    220220#if defined (__cplusplus)

  • branches/libc-0.6/src/emx/include/io.h

    r2229 r3809  
    4747struct timeval;
    4848
    49 int remove (__const__ char *);
    50 int rename (__const__ char *, __const__ char *);
     49int remove (const char *);
     50int rename (const char *, const char *);
    5151
    52 int access (__const__ char *, int);
    53 int chmod (__const__ char *, mode_t);
     52int access (const char *, int);
     53int chmod (const char *, mode_t);
    5454int chsize (int, off_t);
    5555int close (int);
    … …  
    7373int mkstemp (char *);
    7474char *mktemp (char *);
    75 int open (__const__ char *, int, ...);
     75int open (const char *, int, ...);
    7676int pipe (int *);
    7777ssize_t read (int, void *, size_t);
    7878int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
    7979int setmode (int, int);
    80 int sopen (__const__ char *, int, int, ...);
    81 int stat (__const__ char *, struct stat *);
     80int sopen (const char *, int, int, ...);
     81int stat (const char *, struct stat *);
    8282off_t tell (int);
    8383#ifndef _TRUNCATE_DECLARED
    … …  
    8686#endif
    8787mode_t  umask(mode_t);
    88 int unlink (__const__ char *);
    89 int write (int, __const__ void *, size_t);
     88int unlink (const char *);
     89int write (int, const void *, size_t);
    9090
    9191#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    9292
    93 int _access (__const__ char *, int);
    94 int _chmod (__const__ char *, int);
     93int _access (const char *, int);
     94int _chmod (const char *, int);
    9595int _chsize (int, off_t);
    9696int _close (int);
    97 int _creat (__const__ char *, int);
     97int _creat (const char *, int);
    9898int _crlf (char *, size_t, size_t *);
    9999int _dup (int);
    … …  
    117117int _mkstemp (char *);
    118118char *_mktemp (char *);
    119 int _open (__const__ char *, int, ...);
     119int _open (const char *, int, ...);
    120120int _pipe (int *);
    121121ssize_t _read (int, void *, size_t);
    … …  
    123123int _select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
    124124int _setmode (int, int);
    125 int _sopen (__const__ char *, int, int, ...);
    126 int _stat (__const__ char *, struct stat *);
     125int _sopen (const char *, int, int, ...);
     126int _stat (const char *, struct stat *);
    127127off_t _tell (int);
    128128int _truncate (char *, off_t);
    129129int _umask (int);
    130 int _unlink (__const__ char *);
    131 int _write (int, __const__ void *, size_t);
     130int _unlink (const char *);
     131int _write (int, const void *, size_t);
    132132
    133133#endif

  • branches/libc-0.6/src/emx/include/malloc.h

    r2535 r3809  
    5757int _heapmin (void);
    5858int _heapset (unsigned);
    59 int _heap_walk (int (*)(__const__ void *, size_t, int, int,
    60     __const__ char *, size_t));
    61 size_t _msize (__const__ void *);
     59int _heap_walk (int (*)(const void *, size_t, int, int,
     60    const char *, size_t));
     61size_t _msize (const void *);
    6262
    6363#endif

  • branches/libc-0.6/src/emx/include/netdb.h

    r1739 r3809  
    176176/* BSD */
    177177int                 TCPCALL gethostname( char *, int );
    178 struct hostent *    TCPCALL gethostbyname( __const__ char * );
    179 struct hostent *    TCPCALL gethostbyaddr( __const__ char *, int, int );
    180 struct netent *     TCPCALL getnetbyname( __const__ char * );
     178struct hostent *    TCPCALL gethostbyname( const char * );
     179struct hostent *    TCPCALL gethostbyaddr( const char *, int, int );
     180struct netent *     TCPCALL getnetbyname( const char * );
    181181struct netent *     TCPCALL getnetbyaddr( unsigned long, int );
    182 struct servent *    TCPCALL getservbyname( __const__ char *, __const__ char * );
    183 struct servent *    TCPCALL getservbyport( int, __const__ char * );
     182struct servent *    TCPCALL getservbyname( const char *, const char * );
     183struct servent *    TCPCALL getservbyport( int, const char * );
    184184struct servent *    TCPCALL getservent( void );
    185 struct protoent *   TCPCALL getprotobyname( __const__ char * );
     185struct protoent *   TCPCALL getprotobyname( const char * );
    186186struct protoent *   TCPCALL getprotobynumber( int );
    187187void                TCPCALL sethostent( int );
    … …  
    198198void                TCPCALL endservent(void);
    199199#ifndef TCPV40HDRS
    200 struct hostent *    TCPCALL gethostbyname2( __const__ char *, int );
     200struct hostent *    TCPCALL gethostbyname2( const char *, int );
    201201#endif
    202202
    … …  
    220220
    221221/* EMX/BSD additions. */
    222 void                TCPCALL herror(__const__ char *);
     222void                TCPCALL herror(const char *);
    223223
    224224/* EMX/BSD stuff which isn't implemeneted  */

  • branches/libc-0.6/src/emx/include/pwd.h

    r1506 r3809  
    182182
    183183/* bird: emx stuff */
    184 char *getpass (__const__ char *);
    185 char *_getpass1 (__const__ char *);
    186 char *_getpass2 (__const__ char *, int);
     184char *getpass (const char *);
     185char *_getpass1 (const char *);
     186char *_getpass2 (const char *, int);
    187187__END_DECLS
    188188

  • branches/libc-0.6/src/emx/include/stdio.h

    r3714 r3809  
    559559
    560560int _fcloseall (void);
    561 FILE *_fdopen (int, __const__ char *);
     561FILE *_fdopen (int, const char *);
    562562int _fgetchar (void);
    563563int _flushall (void);
    564564int _fputchar (int);
    565565int _fseek_hdr (FILE *);
    566 int _fsetmode (FILE *, __const__ char *);
    567 FILE *_fsopen (__const__ char *, __const__ char *, int);
     566int _fsetmode (FILE *, const char *);
     567FILE *_fsopen (const char *, const char *, int);
    568568int _getw (FILE *);
    569569char *_mfclose (FILE *);
    570 FILE *_mfopen (char *, __const__ char *, size_t, int);
     570FILE *_mfopen (char *, const char *, size_t, int);
    571571int _pclose (FILE *);
    572 FILE *_popen (__const__ char *, __const__ char *);
     572FILE *_popen (const char *, const char *);
    573573int _putw (int, FILE *);
    574574void _setbuffer (FILE *, char *, int);
    575 int _snprintf (char *, size_t, __const__ char *, ...);
    576 char *_tempnam (__const__ char *, __const__ char *);
    577 int _vsnprintf (char *, size_t, __const__ char *, __va_list);
     575int _snprintf (char *, size_t, const char *, ...);
     576char *_tempnam (const char *, const char *);
     577int _vsnprintf (char *, size_t, const char *, __va_list);
    578578
    579579#endif

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

    r2029 r3809  
    369369extern char **environ;
    370370
    371 extern __const__ unsigned char _osminor;
    372 extern __const__ unsigned char _osmajor;
     371extern const unsigned char _osminor;
     372extern const unsigned char _osmajor;
    373373
    374374/* No DOS support ... */
    … …  
    401401
    402402extern char **_environ;
    403 extern __const__ char * __const__ _sys_errlist[];
    404 extern __const__ int _sys_nerr;
     403extern const char * const _sys_errlist[];
     404extern const int _sys_nerr;
    405405
    406406unsigned _alarm (unsigned);
    407407int _brk(const void *);
    408 int _chdir (__const__ char *);
     408int _chdir (const char *);
    409409char *_gcvt (double, int, char *);
    410410char *_getcwd (char *, size_t);
    411411int _getpagesize (void);
    412412char *_getwd (char *);
    413 int _mkdir (__const__ char *, long);
    414 int _putenv (__const__ char *);
    415 int _rmdir (__const__ char *);
     413int _mkdir (const char *, long);
     414int _putenv (const char *);
     415int _rmdir (const char *);
    416416void *_sbrk(intptr_t);
    417417unsigned _sleep (unsigned);
    418 void _swab (__const__ void *, void *, size_t);
     418void _swab (const void *, void *, size_t);
    419419long _ulimit (int, ...);
    420420
    421 int _abspath (char *, __const__ char *, int);
    422 long long _atoll (__const__ char *);
    423 long double _atofl (__const__ char *);
    424 int _chdir2 (__const__ char *);
     421int _abspath (char *, const char *, int);
     422long long _atoll (const char *);
     423long double _atofl (const char *);
     424int _chdir2 (const char *);
    425425int _chdir_os2 (const char *);
    426426int _chdrive (int);
    427427int _core (int);
    428 void _defext (char *, __const__ char *);
    429 void _envargs (int *, char ***, __const__ char *);
     428void _defext (char *, const char *);
     429void _envargs (int *, char ***, const char *);
    430430int _execname (char *, size_t);
    431431void _exit (int) __attribute__ ((__noreturn__));
    432 int _filesys (__const__ char *, char *, size_t);
    433 char **_fnexplode (__const__ char *);
     432int _filesys (const char *, char *, size_t);
     433char **_fnexplode (const char *);
    434434void _fnexplodefree (char **);
    435 char _fngetdrive (__const__ char *);
    436 int _fnisabs (__const__ char *);
    437 int _fnisrel (__const__ char *);
     435char _fngetdrive (const char *);
     436int _fnisabs (const char *);
     437int _fnisrel (const char *);
    438438void _fnlwr (char *);
    439 void _fnlwr2 (char *, __const__ char *);
     439void _fnlwr2 (char *, const char *);
    440440char *_fnslashify (char *);
    441 int _fullpath (char *, __const__ char *, int);
     441int _fullpath (char *, const char *, int);
    442442int _getcwd1 (char *, char);
    443443char *_getcwd2 (char *, int);
    444444int _getdrive (void);
    445 char *_getext (__const__ char *);
    446 char *_getext2 (__const__ char *);
    447 char *_getname (__const__ char *);
     445char *_getext (const char *);
     446char *_getext2 (const char *);
     447char *_getname (const char *);
    448448int _getsockhandle (int);
    449449int _gettid (void);
    … …  
    459459char *_lltoa (long long, char *, int);
    460460char *_ulltoa (unsigned long long, char *, int);
    461 void _makepath (char *, __const__ char *, __const__ char *,
    462     __const__ char *, __const__ char *);
    463 int _path (char *, __const__ char *);
     461void _makepath (char *, const char *, const char *,
     462    const char *, const char *);
     463int _path (char *, const char *);
    464464int _read_kbd (int, int, int);
    465465void _remext (char *);
    … …  
    467467void _response (int *, char ***);
    468468void _scrsize (int *);
    469 void _searchenv (__const__ char *, __const__ char *, char *);
    470 void _sfnlwr (__const__ char *);
     469void _searchenv (const char *, const char *, char *);
     470void _sfnlwr (const char *);
    471471unsigned _sleep2 (unsigned);
    472472char ** _splitargs (char *, int *);
    473 void _splitpath (__const__ char *, char *, char *, char *, char *);
    474 float _strtof (__const__ char *, char **);
    475 long double _strtold (__const__ char *, char **);
    476 long long _strtoll (__const__ char *, char **, int);
    477 unsigned long long _strtoull (__const__ char *, char **, int);
     473void _splitpath (const char *, char *, char *, char *, char *);
     474float _strtof (const char *, char **);
     475long double _strtold (const char *, char **);
     476long long _strtoll (const char *, char **, int);
     477unsigned long long _strtoull (const char *, char **, int);
    478478char _swchar (void);
    479479void _wildcard (int *, char ***);

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

    r2285 r3809  
    130130#define _MEMDIF_EQ 0xffffffff
    131131#endif
    132 int     memicmp(__const__ void *, __const__ void *, size_t);
    133 int     stricmp(__const__ char *, __const__ char *);
     132int     memicmp(const void *, const void *, size_t);
     133int     stricmp(const char *, const char *);
    134134char *  strlwr(char *);
    135 int     strnicmp(__const__ char *, __const__ char *, size_t);
     135int     strnicmp(const char *, const char *, size_t);
    136136char *  strnset(char *, int, size_t);
    137137char *  strrev(char *);
    … …  
    141141
    142142#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    143 size_t _memcount (__const__ void *, int, size_t);
    144 size_t _memdif (__const__ void *, __const__ void *, size_t);
     143size_t _memcount (const void *, int, size_t);
     144size_t _memdif (const void *, const void *, size_t);
    145145void *_memrchr (const void *, int, size_t);
    146146void _memswap (void *, void *, size_t);
    147 char *_strncpy (char *, __const__ char *, size_t);
    148 void *_memccpy (void *, __const__ void *, int, size_t);
    149 int _memicmp (__const__ void *, __const__ void *, size_t);
    150 char *_strdup (__const__ char *);
    151 int _stricmp (__const__ char *, __const__ char *);
     147char *_strncpy (char *, const char *, size_t);
     148void *_memccpy (void *, const void *, int, size_t);
     149int _memicmp (const void *, const void *, size_t);
     150char *_strdup (const char *);
     151int _stricmp (const char *, const char *);
    152152char *_strlwr (char *);
    153 int _strnicmp (__const__ char *, __const__ char *, size_t);
     153int _strnicmp (const char *, const char *, size_t);
    154154char *_strnset (char *, int, size_t);
    155155char *_strrev (char *);
    156156char *_strset (char *, int);
    157157char *_strupr (char *);
    158 char *_strsep (char **, __const__ char *);
     158char *_strsep (char **, const char *);
    159159#endif
    160160
    … …  
    194194#define strdupa(psz) \
    195195    (__extension__({ \
    196         __const__ char *__pszInput = (psz); \
     196        const char *__pszInput = (psz); \
    197197        size_t          __cchInput = strlen(__pszInput) + 1; \
    198198        char           *__pszReturn = __builtin_alloca(__cchInput); \
    … …  
    202202#define strndupa(psz, cch) \
    203203    (__extension__({ \
    204         __const__ char *__pszInput = (psz); \
     204        const char *__pszInput = (psz); \
    205205        size_t          __cchInput = strnlen(__pszInput, (cch)); \
    206206        char           *__pszReturn = __builtin_alloca(__cchInput + 1); \

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

    r732 r3809  
    4141__BEGIN_DECLS
    4242void    _dt_free (struct _dt_tree *dt);
    43 struct _dt_tree *_dt_read (__const__ char *dir, __const__ char *mask,
     43struct _dt_tree *_dt_read (const char *dir, const char *mask,
    4444    unsigned flags);
    45 void    _dt_sort (struct _dt_tree *dt, __const__ char *spec);
    46 int     _dt_split (__const__ char *src, char *dir, char *mask);
     45void    _dt_sort (struct _dt_tree *dt, const char *spec);
     46int     _dt_split (const char *src, char *dir, char *mask);
    4747__END_DECLS
    4848

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

    r18 r3809  
    1616
    1717void _ea_free (struct _ea *);
    18 int _ea_get (struct _ea *, __const__ char *, int, __const__ char *);
    19 int _ea_put (struct _ea *, __const__ char *, int, __const__ char *);
    20 int _ea_remove (__const__ char *, int, __const__ char *);
     18int _ea_get (struct _ea *, const char *, int, const char *);
     19int _ea_put (struct _ea *, const char *, int, const char *);
     20int _ea_remove (const char *, int, const char *);
    2121
    2222#if defined (__cplusplus)

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

    r18 r3809  
    1212typedef struct _ead_data *_ead;
    1313
    14 int _ead_add (_ead, __const__ char *, int, __const__ void *, int);
     14int _ead_add (_ead, const char *, int, const void *, int);
    1515void _ead_clear (_ead);
    1616int _ead_copy (_ead, _ead, int);
    … …  
    2020void _ead_destroy (_ead);
    2121int _ead_fea2list_size (_ead);
    22 void *_ead_fea2list_to_fealist (__const__ void *);
    23 void *_ead_fealist_to_fea2list (__const__ void *);
    24 int _ead_find (_ead, __const__ char *);
    25 __const__ void *_ead_get_fea2list (_ead);
     22void *_ead_fea2list_to_fealist (const void *);
     23void *_ead_fealist_to_fea2list (const void *);
     24int _ead_find (_ead, const char *);
     25const void *_ead_get_fea2list (_ead);
    2626int _ead_get_flags (_ead, int);
    27 __const__ char *_ead_get_name (_ead, int);
    28 __const__ void *_ead_get_value (_ead, int);
     27const char *_ead_get_name (_ead, int);
     28const void *_ead_get_value (_ead, int);
    2929int _ead_name_len (_ead, int);
    30 int _ead_read (_ead, __const__ char *, int, int);
    31 int _ead_replace (_ead, int, int, __const__ void *, int);
     30int _ead_read (_ead, const char *, int, int);
     31int _ead_replace (_ead, int, int, const void *, int);
    3232void _ead_sort (_ead);
    33 int _ead_use_fea2list (_ead, __const__ void *);
     33int _ead_use_fea2list (_ead, const void *);
    3434int _ead_value_size (_ead, int);
    35 int _ead_write (_ead, __const__ char *, int, int);
     35int _ead_write (_ead, const char *, int, int);
    3636
    3737#if defined (__cplusplus)

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

    r2439 r3809  
    297297#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    298298__BEGIN_DECLS
    299 int _creat (__const__ char *, int);
     299int _creat (const char *, int);
    300300int _fcntl (int, int, ...);
    301301int _flock (int, int);
    302 int _open (__const__ char *, int, ...);
     302int _open (const char *, int, ...);
    303303__END_DECLS
    304304#endif

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

    r3645 r3809  
    4949void abort (void)  __attribute__ ((__noreturn__));
    5050int atexit (void (*)(void));
    51 int execl (__const__ char *, __const__ char *, ...);
    52 int execle (__const__ char *, __const__ char *, ...);
    53 int execlp (__const__ char *, __const__ char *, ...);
    54 int execlpe (__const__ char *, __const__ char *, ...);
    55 int execv (__const__ char *, char * __const__ *);
    56 int execve (__const__ char *, char * __const__ *, char * __const__ *);
    57 int execvp (__const__ char *, char * __const__ *);
    58 int execvpe (__const__ char *, char * __const__ *, char * __const__ *);
     51int execl (const char *, const char *, ...);
     52int execle (const char *, const char *, ...);
     53int execlp (const char *, const char *, ...);
     54int execlpe (const char *, const char *, ...);
     55int execv (const char *, char * const *);
     56int execve (const char *, char * const *, char * const *);
     57int execvp (const char *, char * const *);
     58int execvpe (const char *, char * const *, char * const *);
    5959void exit (int) __attribute__ ((__noreturn__));
    6060void _exit (int) __attribute__ ((__noreturn__));
    … …  
    6262pid_t getpid (void);
    6363pid_t getppid (void);
    64 int spawnl (int, __const__ char *, __const__ char *, ...);
    65 int spawnle (int, __const__ char *, __const__ char *, ...);
    66 int spawnlp (int, __const__ char *, __const__ char *, ...);
    67 int spawnlpe (int, __const__ char *, __const__ char *, ...);
    68 int spawnv (int, __const__ char *, char * __const__ *);
    69 int spawnve (int, __const__ char *, char * __const__ *, char * __const__ *);
    70 int spawnvp (int, __const__ char *, char * __const__ *);
    71 int spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
    72 int system (__const__ char *);
     64int spawnl (int, const char *, const char *, ...);
     65int spawnle (int, const char *, const char *, ...);
     66int spawnlp (int, const char *, const char *, ...);
     67int spawnlpe (int, const char *, const char *, ...);
     68int spawnv (int, const char *, char * const *);
     69int spawnve (int, const char *, char * const *, char * const *);
     70int spawnvp (int, const char *, char * const *);
     71int spawnvpe (int, const char *, char * const *, char * const *);
     72int system (const char *);
    7373pid_t wait (int *);
    7474pid_t waitpid (pid_t, int *, int);
    7575
    76 int _execl (__const__ char *, __const__ char *, ...);
    77 int _execle (__const__ char *, __const__ char *, ...);
    78 int _execlp (__const__ char *, __const__ char *, ...);
    79 int _execlpe (__const__ char *, __const__ char *, ...);
    80 int _execv (__const__ char *, char * __const__ *);
    81 int _execve (__const__ char *, char * __const__ *, char * __const__ *);
    82 int _execvp (__const__ char *, char * __const__ *);
    83 int _execvpe (__const__ char *, char * __const__ *, char * __const__ *);
     76int _execl (const char *, const char *, ...);
     77int _execle (const char *, const char *, ...);
     78int _execlp (const char *, const char *, ...);
     79int _execlpe (const char *, const char *, ...);
     80int _execv (const char *, char * const *);
     81int _execve (const char *, char * const *, char * const *);
     82int _execvp (const char *, char * const *);
     83int _execvpe (const char *, char * const *, char * const *);
    8484int _fork (void);
    8585pid_t _getpid (void);
    8686pid_t _getppid (void);
    87 int _spawnl (int, __const__ char *, __const__ char *, ...);
    88 int _spawnle (int, __const__ char *, __const__ char *, ...);
    89 int _spawnlp (int, __const__ char *, __const__ char *, ...);
    90 int _spawnlpe (int, __const__ char *, __const__ char *, ...);
    91 int _spawnv (int, __const__ char *, char * __const__ *);
    92 int _spawnve (int, __const__ char *, char * __const__ *, char * __const__ *);
    93 int _spawnvp (int, __const__ char *, char * __const__ *);
    94 int _spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
     87int _spawnl (int, const char *, const char *, ...);
     88int _spawnle (int, const char *, const char *, ...);
     89int _spawnlp (int, const char *, const char *, ...);
     90int _spawnlpe (int, const char *, const char *, ...);
     91int _spawnv (int, const char *, char * const *);
     92int _spawnve (int, const char *, char * const *, char * const *);
     93int _spawnvp (int, const char *, char * const *);
     94int _spawnvpe (int, const char *, char * const *, char * const *);
    9595pid_t _wait (int *);
    9696pid_t _waitpid (pid_t, int *, int);

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

    r3758 r3809  
    433433
    434434int     TCPCALL accept (int, struct sockaddr *, int *);
    435 int     TCPCALL bind (int, __const__ struct sockaddr *, int);
    436 int     TCPCALL connect (int, __const__ struct sockaddr *, int);
     435int     TCPCALL bind (int, const struct sockaddr *, int);
     436int     TCPCALL connect (int, const struct sockaddr *, int);
    437437int     TCPCALL gethostid (void);
    438438int     TCPCALL getpeername (int, struct sockaddr *, int *);
    … …  
    443443int     TCPCALL recvfrom (int, void *, int, int, struct sockaddr *, int *);
    444444int     TCPCALL recvmsg (int, struct msghdr *, int);
    445 int     TCPCALL send (int, __const__ void *, int, int);
    446 int     TCPCALL sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
    447 int     TCPCALL sendmsg (int, __const__ struct msghdr *, int);
    448 int     TCPCALL setsockopt (int, int, int, __const__ void *, int);
     445int     TCPCALL send (int, const void *, int, int);
     446int     TCPCALL sendto (int, const void *, int, int, const struct sockaddr *, int);
     447int     TCPCALL sendmsg (int, const struct msghdr *, int);
     448int     TCPCALL setsockopt (int, int, int, const void *, int);
    449449int     TCPCALL shutdown (int, int);
    450450int     TCPCALL socket (int, int, int);

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

    r2620 r3809  
    348348/* bird: emx stuff - start */
    349349#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    350 int _chmod (__const__ char *, int);
     350int _chmod (const char *, int);
    351351int _fstat (int, struct stat *);
    352 int _mkdir (__const__ char *, long);
     352int _mkdir (const char *, long);
    353353/* _mkfifo() */
    354 int _stat (__const__ char *, struct stat *);
     354int _stat (const char *, struct stat *);
    355355int _umask (int);
    356356#endif

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

    r1506 r3809  
    142142
    143143__BEGIN_DECLS
    144 speed_t cfgetispeed (__const__ struct termios *);
    145 speed_t cfgetospeed (__const__ struct termios *);
     144speed_t cfgetispeed (const struct termios *);
     145speed_t cfgetospeed (const struct termios *);
    146146int cfsetispeed (struct termios *, speed_t);
    147147int cfsetospeed (struct termios *, speed_t);
    … …  
    151151int tcgetattr (int, struct termios *);
    152152int tcsendbreak (int, int);
    153 int tcsetattr (int, int, __const__ struct termios *);
     153int tcsetattr (int, int, const struct termios *);
    154154
    155155#ifndef _POSIX_SOURCE

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

    r1739 r3809  
    7575
    7676/* EMX versions */
    77 int readv (int, __const__ struct iovec *, int);
    78 int writev (int, __const__ struct iovec *, int);
     77int readv (int, const struct iovec *, int);
     78int writev (int, const struct iovec *, int);
    7979
    8080#if defined (__cplusplus)

  • branches/libc-0.6/src/emx/include/time.h

    r2698 r3809  
    200200extern long _timezone;
    201201extern char *_tzname[2];
    202 char *_strptime (__const__ char *, __const__ char *, struct tm *);
     202char *_strptime (const char *, const char *, struct tm *);
    203203void _tzset (void);
    204204#endif

  • branches/libc-0.6/src/emx/include/umalloc.h

    r2207 r3809  
    7272extern Heap_t _um_regular_heap;
    7373
    74 Heap_t _mheap (__const__ void *);
     74Heap_t _mheap (const void *);
    7575Heap_t _uaddmem (Heap_t, void *, size_t, int);
    7676void *_ucalloc (Heap_t, size_t, size_t);
    … …  
    9090int _uheapset (Heap_t, unsigned);
    9191unsigned _uheap_type (Heap_t);
    92 int _uheap_walk (Heap_t, int (*)(__const__ void *, size_t, int, int,
    93                                  __const__ char *, size_t));
    94 int _uheap_walk2 (Heap_t, int (*)(Heap_t, __const__ void *, size_t, int, int,
    95                                   __const__ char *, size_t, void *), void *);
     92int _uheap_walk (Heap_t, int (*)(const void *, size_t, int, int,
     93                                 const char *, size_t));
     94int _uheap_walk2 (Heap_t, int (*)(Heap_t, const void *, size_t, int, int,
     95                                  const char *, size_t, void *), void *);
    9696void *_umalloc (Heap_t, size_t);
    9797int _uopen (Heap_t);

  • branches/libc-0.6/src/emx/include/utils.h

    r1739 r3809  
    3737#endif
    3838
    39 int strcasecmp (__const__ char *, __const__ char *);
    40 int strncasecmp (__const__ char *, __const__ char *, size_t);
     39int strcasecmp(const char *, const char *);
     40int strncasecmp(const char *, const char *, size_t);
    4141
    4242__END_DECLS
Note: See TracChangeset for help on using the changeset viewer.