about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--posix/unistd.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 79cd539f62..dcf10c58dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
+
+	* posix/unistd.h (intptr_t): Conditionalize on [__USE_MISC ||
+	__USE_XOPEN_EXTENDED] rather than on [__USE_UNIX98].
+	We need this for the sbrk decl, which can be included without Unix98.
+
 2000-03-20  Richard Henderson  <rth@cygnus.com>
 
 	* nis/nss_nis/nis-service.c (_nss_nis_getservbyport_r): Last
diff --git a/posix/unistd.h b/posix/unistd.h
index 3b75286d9e..e482d1b256 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -235,12 +235,12 @@ typedef __pid_t pid_t;
 # endif
 #endif	/* X/Open */
 
-#ifdef __USE_UNIX98
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
 # ifndef __intptr_t_defined
 typedef __intptr_t intptr_t;
 #  define __intptr_t_defined
 # endif
-#endif	/* Unix98 */
+#endif
 
 /* Values for the second argument to access.
    These may be OR'd together.  */