Made these have real constants.

5 files changed, 58 insertions, 50 deletions

diff --git a/c/src/exec/posix/base/aio.h b/c/src/exec/posix/base/aio.h
index 504559c857..6348da4c15 100644
--- a/c/src/exec/posix/base/aio.h
+++ b/c/src/exec/posix/base/aio.h
@@ -25,21 +25,21 @@
  */
 
 #define AIO_CANCELED    0 /* all requested operations have been canceled */
-#define AIO_NOTCANCELED 0 /* some of the operations could not be canceled */
+#define AIO_NOTCANCELED 1 /* some of the operations could not be canceled */
                           /*   since they are in progress */
-#define AIO_ALLDONE     0 /* none of the requested operations could be */
+#define AIO_ALLDONE     2 /* none of the requested operations could be */
                           /*   canceled since they are already complete */
 
 /* lio_listio() options */
 
 #define LIO_WAIT        0 /* calling process is to suspend until the */
                           /*   operation is complete */
-#define LIO_NOWAIT      0 /* calling process is to continue execution while */
+#define LIO_NOWAIT      1 /* calling process is to continue execution while */
                           /*   the operation is performed and no notification */
                           /*   shall be given when the operation is completed */
-#define LIO_READ        0 /* request a read() */
-#define LIO_WRITE       0 /* request a write() */
-#define LIO_NOP         0 /* no transfer is requested */
+#define LIO_READ        2 /* request a read() */
+#define LIO_WRITE       3 /* request a write() */
+#define LIO_NOP         4 /* no transfer is requested */
 
 /*
  *  6.7.1.1 Asynchronous I/O Control Block, P1003.1b-1993, p. 151
diff --git a/c/src/exec/posix/base/unistd.h b/c/src/exec/posix/base/unistd.h
index 147e80c11d..0001ecc475 100644
--- a/c/src/exec/posix/base/unistd.h
+++ b/c/src/exec/posix/base/unistd.h
@@ -55,23 +55,27 @@
  *  P1003.1c/D10, p. 52 adds the following.
  */
 
-#define _SC_GETGR_R_SIZE_MAX       35
-#define _SC_GETPW_R_SIZE_MAX
-#define _SC_LOGIN_NAME_MAX
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS
-#define _SC_THREAD_KEYS_MAX
-#define _SC_THREAD_STACK_MIN
-#define _SC_THREAD_THREADS_MAX
-#define _SC_TTY_NAME_MAX
+#define _SC_GETGR_R_SIZE_MAX             35
+#define _SC_GETPW_R_SIZE_MAX             36
+#define _SC_LOGIN_NAME_MAX               37
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS 38
+#define _SC_THREAD_KEYS_MAX              39
+#define _SC_THREAD_STACK_MIN             40
+#define _SC_THREAD_THREADS_MAX           41
+#define _SC_TTY_NAME_MAX                 42
 
-#define _SC_THREADS
-#define _SC_THREAD_ATTR_STACKADDR
-#define _SC_THREAD_ATTR_STACKSIZE
-#define _SC_THREAD_PRIORITY_SCHEDULING
-#define _SC_THREAD_PRIO_INHERIT
-#define _SC_THREAD_PRIO_CEILING
-#define _SC_THREAD_PROCESS_SHARED
-#define _SC_THREAD_SAGE_FUNCTIONS
+#define _SC_THREADS                      43
+#define _SC_THREAD_ATTR_STACKADDR        44
+#define _SC_THREAD_ATTR_STACKSIZE        45
+#define _SC_THREAD_PRIORITY_SCHEDULING   46
+#define _SC_THREAD_PRIO_INHERIT          47
+#define _SC_THREAD_PRIO_CEILING          48
+#define _SC_THREAD_PROCESS_SHARED        49
+#define _SC_THREAD_SAFE_FUNCTIONS        50
+
+/* JRS: 04/02/98: _SC_THREAD_PRIO_CEILING seems to have changed names
+ *                in the final standard to _SC_THREAD_PRIO_PROTECT.
+ */
 
 /*
  *  4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 95
diff --git a/c/src/exec/posix/include/aio.h b/c/src/exec/posix/include/aio.h
index 504559c857..6348da4c15 100644
--- a/c/src/exec/posix/include/aio.h
+++ b/c/src/exec/posix/include/aio.h
@@ -25,21 +25,21 @@
  */
 
 #define AIO_CANCELED    0 /* all requested operations have been canceled */
-#define AIO_NOTCANCELED 0 /* some of the operations could not be canceled */
+#define AIO_NOTCANCELED 1 /* some of the operations could not be canceled */
                           /*   since they are in progress */
-#define AIO_ALLDONE     0 /* none of the requested operations could be */
+#define AIO_ALLDONE     2 /* none of the requested operations could be */
                           /*   canceled since they are already complete */
 
 /* lio_listio() options */
 
 #define LIO_WAIT        0 /* calling process is to suspend until the */
                           /*   operation is complete */
-#define LIO_NOWAIT      0 /* calling process is to continue execution while */
+#define LIO_NOWAIT      1 /* calling process is to continue execution while */
                           /*   the operation is performed and no notification */
                           /*   shall be given when the operation is completed */
-#define LIO_READ        0 /* request a read() */
-#define LIO_WRITE       0 /* request a write() */
-#define LIO_NOP         0 /* no transfer is requested */
+#define LIO_READ        2 /* request a read() */
+#define LIO_WRITE       3 /* request a write() */
+#define LIO_NOP         4 /* no transfer is requested */
 
 /*
  *  6.7.1.1 Asynchronous I/O Control Block, P1003.1b-1993, p. 151
diff --git a/c/src/exec/posix/include/unistd.h b/c/src/exec/posix/include/unistd.h
index 147e80c11d..0001ecc475 100644
--- a/c/src/exec/posix/include/unistd.h
+++ b/c/src/exec/posix/include/unistd.h
@@ -55,23 +55,27 @@
  *  P1003.1c/D10, p. 52 adds the following.
  */
 
-#define _SC_GETGR_R_SIZE_MAX       35
-#define _SC_GETPW_R_SIZE_MAX
-#define _SC_LOGIN_NAME_MAX
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS
-#define _SC_THREAD_KEYS_MAX
-#define _SC_THREAD_STACK_MIN
-#define _SC_THREAD_THREADS_MAX
-#define _SC_TTY_NAME_MAX
+#define _SC_GETGR_R_SIZE_MAX             35
+#define _SC_GETPW_R_SIZE_MAX             36
+#define _SC_LOGIN_NAME_MAX               37
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS 38
+#define _SC_THREAD_KEYS_MAX              39
+#define _SC_THREAD_STACK_MIN             40
+#define _SC_THREAD_THREADS_MAX           41
+#define _SC_TTY_NAME_MAX                 42
 
-#define _SC_THREADS
-#define _SC_THREAD_ATTR_STACKADDR
-#define _SC_THREAD_ATTR_STACKSIZE
-#define _SC_THREAD_PRIORITY_SCHEDULING
-#define _SC_THREAD_PRIO_INHERIT
-#define _SC_THREAD_PRIO_CEILING
-#define _SC_THREAD_PROCESS_SHARED
-#define _SC_THREAD_SAGE_FUNCTIONS
+#define _SC_THREADS                      43
+#define _SC_THREAD_ATTR_STACKADDR        44
+#define _SC_THREAD_ATTR_STACKSIZE        45
+#define _SC_THREAD_PRIORITY_SCHEDULING   46
+#define _SC_THREAD_PRIO_INHERIT          47
+#define _SC_THREAD_PRIO_CEILING          48
+#define _SC_THREAD_PROCESS_SHARED        49
+#define _SC_THREAD_SAFE_FUNCTIONS        50
+
+/* JRS: 04/02/98: _SC_THREAD_PRIO_CEILING seems to have changed names
+ *                in the final standard to _SC_THREAD_PRIO_PROTECT.
+ */
 
 /*
  *  4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 95
diff --git a/cpukit/posix/include/aio.h b/cpukit/posix/include/aio.h
index 504559c857..6348da4c15 100644
--- a/cpukit/posix/include/aio.h
+++ b/cpukit/posix/include/aio.h
@@ -25,21 +25,21 @@
  */
 
 #define AIO_CANCELED    0 /* all requested operations have been canceled */
-#define AIO_NOTCANCELED 0 /* some of the operations could not be canceled */
+#define AIO_NOTCANCELED 1 /* some of the operations could not be canceled */
                           /*   since they are in progress */
-#define AIO_ALLDONE     0 /* none of the requested operations could be */
+#define AIO_ALLDONE     2 /* none of the requested operations could be */
                           /*   canceled since they are already complete */
 
 /* lio_listio() options */
 
 #define LIO_WAIT        0 /* calling process is to suspend until the */
                           /*   operation is complete */
-#define LIO_NOWAIT      0 /* calling process is to continue execution while */
+#define LIO_NOWAIT      1 /* calling process is to continue execution while */
                           /*   the operation is performed and no notification */
                           /*   shall be given when the operation is completed */
-#define LIO_READ        0 /* request a read() */
-#define LIO_WRITE       0 /* request a write() */
-#define LIO_NOP         0 /* no transfer is requested */
+#define LIO_READ        2 /* request a read() */
+#define LIO_WRITE       3 /* request a write() */
+#define LIO_NOP         4 /* no transfer is requested */
 
 /*
  *  6.7.1.1 Asynchronous I/O Control Block, P1003.1b-1993, p. 151