* libc/include/ctype.h: __CYGWIN32__ -> __CYGWIN__

* libc/include/malloc.h: Ditto.
* libc/include/process.h: Ditto.
* libc/include/stdio.h: Ditto.
* libc/include/stdlib.h: Ditto.
* libc/include/time.h: Ditto.
* libc/include/machine/setjmp.h: Ditto.
* libc/include/sys/errno.h: Ditto.
* libc/include/sys/signal.h: Ditto.
* libc/include/sys/stat.h: Ditto.
* libc/include/sys/time.h: Ditto.
* libc/include/sys/unistd.h: Ditto.
* libc/include/string.h: Ditto.  strsignal should return a const char *.
This commit is contained in:
Christopher Faylor 2000-05-30 17:18:05 +00:00
parent ec50441f4a
commit d2dd57657c
14 changed files with 39 additions and 23 deletions

View File

@ -1,3 +1,19 @@
Tue May 30 13:13:01 2000 Christopher Faylor <cgf@cygnus.com>
* libc/include/ctype.h: __CYGWIN32__ -> __CYGWIN__
* libc/include/malloc.h: Ditto.
* libc/include/process.h: Ditto.
* libc/include/stdio.h: Ditto.
* libc/include/stdlib.h: Ditto.
* libc/include/time.h: Ditto.
* libc/include/machine/setjmp.h: Ditto.
* libc/include/sys/errno.h: Ditto.
* libc/include/sys/signal.h: Ditto.
* libc/include/sys/stat.h: Ditto.
* libc/include/sys/time.h: Ditto.
* libc/include/sys/unistd.h: Ditto.
* libc/include/string.h: Ditto. strsignal should return a const char *.
2000-05-26 Marek Michalkiewicz <marekm@linux.org.pl> 2000-05-26 Marek Michalkiewicz <marekm@linux.org.pl>
* libm/common/s_expm1.c (expm1): Add curly braces, avoid warnings. * libm/common/s_expm1.c (expm1): Add curly braces, avoid warnings.

View File

@ -36,7 +36,7 @@ int _EXFUN(_toupper, (int __c));
#define _X 0100 #define _X 0100
#define _B 0200 #define _B 0200
#if !defined(__CYGWIN32__) || defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB) #if !defined(__CYGWIN__) || defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB)
extern _CONST char _ctype_[]; extern _CONST char _ctype_[];
#else #else
extern _CONST char _ctype_[] __declspec(dllimport); extern _CONST char _ctype_[] __declspec(dllimport);

View File

@ -147,7 +147,7 @@ typedef _JBTYPE jmp_buf[_JBLEN];
typedef int jmp_buf[_JBLEN]; typedef int jmp_buf[_JBLEN];
#endif #endif
#if defined(__CYGWIN32__) || defined(__rtems__) #if defined(__CYGWIN__) || defined(__rtems__)
#include <signal.h> #include <signal.h>
/* POSIX sigsetjmp/siglongjmp macros */ /* POSIX sigsetjmp/siglongjmp macros */
@ -164,5 +164,5 @@ typedef int sigjmp_buf[_JBLEN+2];
sigprocmask (SIG_SETMASK, (sigset_t *) &env[_SIGMASK], 0):0),\ sigprocmask (SIG_SETMASK, (sigset_t *) &env[_SIGMASK], 0):0),\
longjmp (env, val)) longjmp (env, val))
#endif /* __CYGWIN32__ or __rtems__ */ #endif /* __CYGWIN__ or __rtems__ */
#endif #endif

View File

@ -79,7 +79,7 @@ extern void cfree _PARAMS ((_PTR));
extern _VOID mstats _PARAMS ((char *)); extern _VOID mstats _PARAMS ((char *));
extern _VOID _mstats_r _PARAMS ((struct _reent *, char *)); extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
/* Cygwin32 needs to be able to copy all the malloc information from /* Cygwin32 needs to be able to copy all the malloc information from
the parent to the child. However, cygwin32 does not normally copy the parent to the child. However, cygwin32 does not normally copy
@ -88,7 +88,7 @@ extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
extern int __malloc_copy _PARAMS ((int (*) (void *, void *, void *, int), extern int __malloc_copy _PARAMS ((int (*) (void *, void *, void *, int),
void *, int)); void *, int));
#endif /* __CYGWIN32 */ #endif /* __CYGWIN */
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -27,7 +27,7 @@ int spawnve(int mode, const char *path, char * const *argv, const char * const *
int spawnvp(int mode, const char *path, const char * const *argv); int spawnvp(int mode, const char *path, const char * const *argv);
int spawnvpe(int mode, const char *path, const char * const *argv, const char * const *envp); int spawnvpe(int mode, const char *path, const char * const *argv, const char * const *envp);
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
/* Secure exec() functions family */ /* Secure exec() functions family */
/* The first arg should really be a HANDLE which is a void *. But we /* The first arg should really be a HANDLE which is a void *. But we
can't include windows.h here so... */ can't include windows.h here so... */

View File

@ -66,7 +66,7 @@ typedef struct __sFILE FILE;
#define __SNPT 0x0800 /* do not do fseek() optimisation */ #define __SNPT 0x0800 /* do not do fseek() optimisation */
#define __SOFF 0x1000 /* set iff _offset is in fact correct */ #define __SOFF 0x1000 /* set iff _offset is in fact correct */
#define __SMOD 0x2000 /* true => fgetline modified _p text */ #define __SMOD 0x2000 /* true => fgetline modified _p text */
#if defined(__CYGWIN__) || defined(__CYGWIN32__) #if defined(__CYGWIN__) || defined(__CYGWIN__)
#define __SCLE 0x4000 /* convert line endings CR/LF <-> NL */ #define __SCLE 0x4000 /* convert line endings CR/LF <-> NL */
#endif #endif
@ -334,7 +334,7 @@ static __inline int __sputc(int _c, FILE *_p) {
__swbuf((int)(x), p) == EOF : (*(p)->_p = (x), (p)->_p++, 0)) __swbuf((int)(x), p) == EOF : (*(p)->_p = (x), (p)->_p++, 0))
#define L_cuserid 9 /* posix says it goes in stdio.h :( */ #define L_cuserid 9 /* posix says it goes in stdio.h :( */
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#define L_ctermid 16 #define L_ctermid 16
#endif #endif
#endif #endif

View File

@ -39,7 +39,7 @@ typedef struct
#define RAND_MAX 0x7fffffff #define RAND_MAX 0x7fffffff
#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && ! defined(_COMPILING_NEWLIB) #if (defined(__CYGWIN__) || defined(__CYGWIN__)) && ! defined(_COMPILING_NEWLIB)
extern __declspec(dllimport) int __mb_cur_max; extern __declspec(dllimport) int __mb_cur_max;
#else #else
extern int __mb_cur_max; extern int __mb_cur_max;
@ -113,7 +113,7 @@ char * _EXFUN(ecvtf,(float,int,int *,int *));
char * _EXFUN(dtoa,(double, int, int, int *, int*, char**)); char * _EXFUN(dtoa,(double, int, int, int *, int*, char**));
int _EXFUN(rand_r,(unsigned *__seed)); int _EXFUN(rand_r,(unsigned *__seed));
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
char * _EXFUN(realpath,(const char *, char *)); char * _EXFUN(realpath,(const char *, char *));
void _EXFUN(unsetenv,(const char *__string)); void _EXFUN(unsetenv,(const char *__string));
void _EXFUN(_unsetenv_r,(struct _reent *, const char *__string)); void _EXFUN(_unsetenv_r,(struct _reent *, const char *__string));

View File

@ -66,8 +66,8 @@ int _EXFUN(strncasecmp,(const char *, const char *, size_t));
char *_EXFUN(strsep,(char **, const char *)); char *_EXFUN(strsep,(char **, const char *));
char *_EXFUN(strlwr,(char *)); char *_EXFUN(strlwr,(char *));
char *_EXFUN(strupr,(char *)); char *_EXFUN(strupr,(char *));
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
char *_EXFUN(strsignal, (int __signo)); const char *_EXFUN(strsignal, (int __signo));
int _EXFUN(strtosigno, (const char *__name)); int _EXFUN(strtosigno, (const char *__name));
#endif #endif
void _EXFUN(swab,(const void *, void *, ssize_t)); void _EXFUN(swab,(const void *, void *, ssize_t));

View File

@ -15,7 +15,7 @@ extern "C" {
extern int *__errno _PARAMS ((void)); extern int *__errno _PARAMS ((void));
#endif #endif
#if !defined(__CYGWIN32__) || defined(__INSIDE_CYGWIN__) #if !defined(__CYGWIN__) || defined(__INSIDE_CYGWIN__)
extern _CONST char * _CONST _sys_errlist[]; extern _CONST char * _CONST _sys_errlist[];
extern int _sys_nerr; extern int _sys_nerr;
#else #else

View File

@ -31,7 +31,7 @@ struct sigaction
int sigprocmask (int __how, const sigset_t *__a, sigset_t *__b); int sigprocmask (int __how, const sigset_t *__a, sigset_t *__b);
/* protos for functions found in winsup sources */ /* protos for functions found in winsup sources */
#if defined(__CYGWIN32__) #if defined(__CYGWIN__)
#undef sigaddset #undef sigaddset
#undef sigemptyset #undef sigemptyset
/* The first argument to kill should be pid_t. Right now /* The first argument to kill should be pid_t. Right now
@ -86,7 +86,7 @@ int _EXFUN(sigpause, (int));
#define SIGUSR1 18 #define SIGUSR1 18
#define SIGUSR2 19 #define SIGUSR2 19
#define NSIG 20 #define NSIG 20
#elif defined(__CYGWIN32__) /* BSD signals symantics */ #elif defined(__CYGWIN__) /* BSD signals symantics */
#define SIGHUP 1 /* hangup */ #define SIGHUP 1 /* hangup */
#define SIGINT 2 /* interrupt */ #define SIGINT 2 /* interrupt */
#define SIGQUIT 3 /* quit */ #define SIGQUIT 3 /* quit */

View File

@ -134,7 +134,7 @@ int _EXFUN(lstat,( const char *__path, struct stat *__buf ));
int _EXFUN(_fstat,( int __fd, struct stat *__sbuf )); int _EXFUN(_fstat,( int __fd, struct stat *__sbuf ));
int _EXFUN(_stat,( const char *__path, struct stat *__sbuf )); int _EXFUN(_stat,( const char *__path, struct stat *__sbuf ));
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
int _EXFUN(lstat,( const char *__path, struct stat *__buf )); int _EXFUN(lstat,( const char *__path, struct stat *__buf ));
#endif #endif

View File

@ -23,9 +23,9 @@ struct timezone {
int tz_dsttime; int tz_dsttime;
}; };
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#include <sys/select.h> #include <sys/select.h>
#endif /* __CYGWIN32__ */ #endif /* __CYGWIN__ */
#endif /* _WINSOCK_H */ #endif /* _WINSOCK_H */

View File

@ -83,7 +83,7 @@ void * _EXFUN(_sbrk, (size_t __incr));
int _EXFUN(_unlink, (const char *__path )); int _EXFUN(_unlink, (const char *__path ));
int _EXFUN(_write, (int __fildes, const void *__buf, size_t __nbyte )); int _EXFUN(_write, (int __fildes, const void *__buf, size_t __nbyte ));
#if defined(__CYGWIN32__) || defined(__rtems__) #if defined(__CYGWIN__) || defined(__rtems__)
unsigned _EXFUN(usleep, (unsigned int __useconds)); unsigned _EXFUN(usleep, (unsigned int __useconds));
int _EXFUN(ftruncate, (int __fd, off_t __length)); int _EXFUN(ftruncate, (int __fd, off_t __length));
int _EXFUN(truncate, (const char *, off_t __length)); int _EXFUN(truncate, (const char *, off_t __length));
@ -125,7 +125,7 @@ int _EXFUN(symlink, (const char *__name1, const char *__name2));
#endif #endif
#endif #endif
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
# define _POSIX_JOB_CONTROL 1 # define _POSIX_JOB_CONTROL 1
# define _POSIX_SAVED_IDS 0 # define _POSIX_SAVED_IDS 0
# define _POSIX_VERSION 199009L # define _POSIX_VERSION 199009L
@ -166,7 +166,7 @@ long _EXFUN(sysconf, (int __name));
# endif /* _POSIX_SOURCE */ # endif /* _POSIX_SOURCE */
/* FIXME: This is temporary until winsup gets sorted out. */ /* FIXME: This is temporary until winsup gets sorted out. */
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#define MAXPATHLEN (260 - 1 /* NUL */) #define MAXPATHLEN (260 - 1 /* NUL */)
#else #else
# define MAXPATHLEN 1024 # define MAXPATHLEN 1024

View File

@ -72,7 +72,7 @@ char *_EXFUN(ctime_r, (const time_t *, char *));
struct tm *_EXFUN(gmtime_r, (const time_t *, struct tm *)); struct tm *_EXFUN(gmtime_r, (const time_t *, struct tm *));
struct tm *_EXFUN(localtime_r, (const time_t *, struct tm *)); struct tm *_EXFUN(localtime_r, (const time_t *, struct tm *));
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#ifndef __STRICT_ANSI__ #ifndef __STRICT_ANSI__
extern time_t _timezone __declspec(dllimport); extern time_t _timezone __declspec(dllimport);
extern int _daylight __declspec(dllimport); extern int _daylight __declspec(dllimport);
@ -81,7 +81,7 @@ extern char *_tzname[2] __declspec(dllimport);
char *_EXFUN(timezone, (void)); char *_EXFUN(timezone, (void));
void _EXFUN(tzset, (void)); void _EXFUN(tzset, (void));
#endif #endif
#endif /* __CYGWIN32__ */ #endif /* __CYGWIN__ */
#ifdef __cplusplus #ifdef __cplusplus
} }