diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/fnmatch.h | 4 | ||||
| -rw-r--r-- | posix/glob.h | 2 | ||||
| -rw-r--r-- | posix/regex.h | 2 | ||||
| -rw-r--r-- | posix/sys/wait.h | 4 | ||||
| -rw-r--r-- | posix/unistd.h | 11 | ||||
| -rw-r--r-- | posix/wordexp.h | 4 |
6 files changed, 17 insertions, 10 deletions
diff --git a/posix/fnmatch.h b/posix/fnmatch.h index 4d1eb3e2d3..0966ee301a 100644 --- a/posix/fnmatch.h +++ b/posix/fnmatch.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 96, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -66,7 +66,7 @@ extern "C" { `fnmatch'. Since this is not the case here it will never be returned but the conformance test suites still require the symbol to be defined. */ -#if (_XOPEN_SOURCE - 0) == 500 +#ifdef _XOPEN_SOURCE # define FNM_NOSYS (-1) #endif diff --git a/posix/glob.h b/posix/glob.h index 0b7808b15c..5a8e48c196 100644 --- a/posix/glob.h +++ b/posix/glob.h @@ -84,7 +84,7 @@ extern "C" { `glob'. Since this is not the case here it will never be returned but the conformance test suites still require the symbol to be defined. */ -#if (_XOPEN_SOURCE - 0) == 500 +#ifdef _XOPEN_SOURCE # define GLOB_NOSYS (-1) #endif diff --git a/posix/regex.h b/posix/regex.h index 0efef36e66..2bca5378a4 100644 --- a/posix/regex.h +++ b/posix/regex.h @@ -282,7 +282,7 @@ extern reg_syntax_t re_syntax_options; `re_error_msg' table in regex.c. */ typedef enum { -#if (_XOPEN_SOURCE - 0) == 500 +#ifdef _XOPEN_SOURCE REG_ENOSYS = -1, /* This will never happen for this implementation. */ #endif diff --git a/posix/sys/wait.h b/posix/sys/wait.h index ed904d909b..1eeac91200 100644 --- a/posix/sys/wait.h +++ b/posix/sys/wait.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ __BEGIN_DECLS #include <bits/types.h> -#if defined __USE_UNIX98 && !defined pid_t +#if defined __USE_XOPEN && !defined pid_t typedef __pid_t pid_t; # define pid_t pid_t #endif diff --git a/posix/unistd.h b/posix/unistd.h index fa28d94d1e..d56c56d45a 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -198,7 +198,7 @@ typedef __ssize_t ssize_t; #define __need_NULL #include <stddef.h> -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN /* The Single Unix specification says that some more types are available here. */ # ifndef gid_t @@ -228,7 +228,9 @@ typedef __off64_t off64_t; typedef __pid_t pid_t; # define pid_t pid_t # endif +#endif /* X/Open */ +#ifdef __USE_UNIX98 # ifndef intptr_t typedef __intptr_t intptr_t; # define intptr_t intptr_t @@ -1055,7 +1057,7 @@ extern void swab __P ((__const __ptr_t __from, __ptr_t __to, ssize_t __n)); /* The Single Unix specification, version 2, demands these prototypes to be here. They are also found in <stdio.h>. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN /* Return the name of the controlling terminal. */ extern char *ctermid __P ((char *__s)); @@ -1063,7 +1065,12 @@ extern char *ctermid __P ((char *__s)); used and might go away some time. */ extern char *cuserid __P ((char *__s)); +/* Rename file OLD to NEW. */ +extern int rename __P ((__const char *__old, __const char *__new)); +#endif + +#if defined __USE_POSIX199309 || defined __USE_UNIX98 /* This function is only available if the system has POSIX threads. */ /* Install handlers to be called when a new process is created with FORK. diff --git a/posix/wordexp.h b/posix/wordexp.h index cd5fba9b41..2bdce27f93 100644 --- a/posix/wordexp.h +++ b/posix/wordexp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,7 +47,7 @@ typedef struct /* Possible nonzero return values from `wordexp'. */ enum { -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN WRDE_NOSYS = -1, /* Never used since we support `wordexp'. */ #endif WRDE_NOSPACE = 1, /* Ran out of memory. */ |