summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>2008-04-01 19:23:28 +0000
committerdrochner <drochner@NetBSD.org>2008-04-01 19:23:28 +0000
commit7cc98087b6344bf4e24bc4d21177d7a2f8426250 (patch)
tree1ab8c662db2639275f7c263ac979eb0c5576515e /include
parentba327d43014357adb0224b11662b123ddb1dbdfe (diff)
everyone else assumes that defining "_XOPEN_SOURCE" means XPG4.2,
so remove comparisions against the numerical values "3" or "4"
Diffstat (limited to 'include')
-rw-r--r--include/stdlib.h4
-rw-r--r--include/time.h4
-rw-r--r--include/unistd.h14
-rw-r--r--include/wordexp.h4
4 files changed, 9 insertions, 17 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index 70862e4c7de..2ba9c2c9f1e 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.82 2008/02/28 16:13:35 christos Exp $ */
+/* $NetBSD: stdlib.h,v 1.83 2008/04/01 19:23:28 drochner Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -148,7 +148,7 @@ int rand_r(unsigned int *);
/*
* X/Open Portability Guide >= Issue 4
*/
-#if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
double drand48(void);
double erand48(unsigned short[3]);
long jrand48(unsigned short[3]);
diff --git a/include/time.h b/include/time.h
index 29c07c514f7..5f2d5d9c356 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.35 2005/09/13 01:44:32 christos Exp $ */
+/* $NetBSD: time.h,v 1.36 2008/04/01 19:23:28 drochner Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -117,7 +117,7 @@ void tzset(void);
/*
* X/Open Portability Guide >= Issue 4
*/
-#if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
extern int daylight;
#ifndef __LIBC12_SOURCE__
extern long int timezone __RENAME(__timezone13);
diff --git a/include/unistd.h b/include/unistd.h
index 9593b7fa5c7..6e58ccee43b 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.114 2007/12/24 17:26:09 perry Exp $ */
+/* $NetBSD: unistd.h,v 1.115 2008/04/01 19:23:28 drochner Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -147,7 +147,7 @@ ssize_t write(int, const void *, size_t);
/*
* IEEE Std 1003.2-92, adopted in X/Open Portability Guide Issue 4 and later
*/
-#if (_POSIX_C_SOURCE - 0) >= 2 || (_XOPEN_SOURCE - 0) >= 4 || \
+#if (_POSIX_C_SOURCE - 0) >= 2 || defined(_XOPEN_SOURCE) || \
defined(_NETBSD_SOURCE)
int getopt(int, char * const [], const char *);
@@ -214,17 +214,9 @@ int nice(int);
/*
- * X/Open Portability Guide <= Issue 3
- */
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0) <= 3
-int rename(const char *, const char *) __RENAME(__posix_rename);
-#endif
-
-
-/*
* X/Open Portability Guide >= Issue 4
*/
-#if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
__aconst char *crypt(const char *, const char *);
int encrypt(char *, int);
char *getpass(const char *);
diff --git a/include/wordexp.h b/include/wordexp.h
index c3b35b215dd..defc9158a9d 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wordexp.h,v 1.1 2004/07/13 15:42:03 seb Exp $ */
+/* $NetBSD: wordexp.h,v 1.2 2008/04/01 19:23:28 drochner Exp $ */
/*-
* Copyright (c) 2002 Tim J. Robbins.
@@ -67,7 +67,7 @@ typedef struct {
#define WRDE_BADVAL 2 /* undefined variable */
#define WRDE_CMDSUB 3 /* command substitution not allowed */
#define WRDE_NOSPACE 4 /* no memory for result */
-#if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
#define WRDE_NOSYS 5 /* obsolete, reserved */
#endif
#define WRDE_SYNTAX 6 /* shell syntax error */