2000-10-30 Joel Sherrill <joel@OARcorp.com>

	* include/Makefile.am: Updated to reflect files merged into newlib.
	This resulted in some definitions moving to other files and thus
	some secondary effects in RTEMS source code.
	* include/unistd.h: Removed.  Now use newlib's.
	* include/rtems/posix/mqueue.h: Add include of <signal.h>.
	* include/rtems/posix/threadsup.h: Add include of <sys/signal.h>
	* src/execv.c: Corrected prototype to agree with newlib.
	* src/execve.c: Corrected prototype to agree with newlib.
	* src/execvp.c: Corrected prototype to agree with newlib.
	* src/psignal.c: Rewrote reference to <siginfo.h> in comment since
	that file no longer exists.
	* src/pthreadkill.c: Added include of <signal.h>.
	* src/sigaction.c: Added include of <signal.h>.
	* src/sigtimedwait.c: Rewrote reference to <siginfo.h> in comment since
	that file no longer exists.
	*

11 files changed, 28 insertions, 10 deletions

diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 26b1fe5578..50bf38f01c 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-30	Joel Sherrill <joel@OARcorp.com>
+
+	* include/Makefile.am: Updated to reflect files merged into newlib.
+	This resulted in some definitions moving to other files and thus
+	some secondary effects in RTEMS source code.
+	* include/unistd.h: Removed.  Now use newlib's.
+	* include/rtems/posix/mqueue.h: Add include of <signal.h>.
+	* include/rtems/posix/threadsup.h: Add include of <sys/signal.h>
+	* src/execv.c: Corrected prototype to agree with newlib.
+	* src/execve.c: Corrected prototype to agree with newlib.
+	* src/execvp.c: Corrected prototype to agree with newlib.
+	* src/psignal.c: Rewrote reference to <siginfo.h> in comment since
+	that file no longer exists.
+	* src/pthreadkill.c: Added include of <signal.h>.
+	* src/sigaction.c: Added include of <signal.h>.
+	* src/sigtimedwait.c: Rewrote reference to <siginfo.h> in comment since
+	that file no longer exists.
+
 2000-10-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
diff --git a/cpukit/posix/include/Makefile.am b/cpukit/posix/include/Makefile.am
index 387e599641..16db0edd0d 100644
--- a/cpukit/posix/include/Makefile.am
+++ b/cpukit/posix/include/Makefile.am
@@ -4,8 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-## RTEMS unistd.h needs to be checked against newlib's and removed
-UNUSED_H_FILES = devctl.h intr.h unistd.h
+UNUSED_H_FILES = devctl.h intr.h
 
 H_FILES = sched.h aio.h mqueue.h semaphore.h
 
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h
index e3f7a2f073..6b2cb9e464 100644
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ b/cpukit/posix/include/rtems/posix/mqueue.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <sys/siginfo.h>
+#include <signal.h>
 
 #include <rtems/score/coremsg.h>
 #include <rtems/score/object.h>
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
index ee93f8252c..2ffc606911 100644
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ b/cpukit/posix/include/rtems/posix/threadsup.h
@@ -6,6 +6,7 @@
 #ifndef __RTEMS_POSIX_THREAD_SUPPORT_h
 #define __RTEMS_POSIX_THREAD_SUPPORT_h
 
+#include <sys/signal.h>
 #include <rtems/score/coresem.h>
 #include <rtems/score/tqdata.h>
 
diff --git a/cpukit/posix/src/execv.c b/cpukit/posix/src/execv.c
index d05f4a2c58..3a2d41d107 100644
--- a/cpukit/posix/src/execv.c
+++ b/cpukit/posix/src/execv.c
@@ -8,8 +8,7 @@
 
 int execv(
   const char *file,
-  char *const argv[],
-  ...
+  char *const argv[]
 )
 {
   errno = ENOSYS;
diff --git a/cpukit/posix/src/execve.c b/cpukit/posix/src/execve.c
index 478af706ea..ee3415b154 100644
--- a/cpukit/posix/src/execve.c
+++ b/cpukit/posix/src/execve.c
@@ -9,8 +9,7 @@
 int execve(
   const char *path,
   char *const argv[],
-  char *const envp[],
-  ...
+  char *const envp[]
 )
 {
   errno = ENOSYS;
diff --git a/cpukit/posix/src/execvp.c b/cpukit/posix/src/execvp.c
index a9d7694fbd..19f49fec58 100644
--- a/cpukit/posix/src/execvp.c
+++ b/cpukit/posix/src/execvp.c
@@ -8,7 +8,7 @@
 
 int execvp(
   const char *path,
-  char const *argv[]
+  char *const argv[]
 )
 {
   errno = ENOSYS;
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
index 1df8def77d..07c2ad5b07 100644
--- a/cpukit/posix/src/psignal.c
+++ b/cpukit/posix/src/psignal.c
@@ -140,7 +140,7 @@ restart:
 
   }
 
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
 
   for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
 
diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c
index 37de5fc4c0..3b789fc8e7 100644
--- a/cpukit/posix/src/pthreadkill.c
+++ b/cpukit/posix/src/pthreadkill.c
@@ -13,6 +13,7 @@
 
 
 #include <pthread.h>
+#include <signal.h>
 #include <errno.h>
 
 #include <rtems/system.h>
diff --git a/cpukit/posix/src/sigaction.c b/cpukit/posix/src/sigaction.c
index f7c525e002..aca5702329 100644
--- a/cpukit/posix/src/sigaction.c
+++ b/cpukit/posix/src/sigaction.c
@@ -13,6 +13,7 @@
 
 
 #include <pthread.h>
+#include <signal.h>
 #include <errno.h>
 
 #include <rtems/system.h>
diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c
index 3300b7383d..b87d9cbd3d 100644
--- a/cpukit/posix/src/sigtimedwait.c
+++ b/cpukit/posix/src/sigtimedwait.c
@@ -34,7 +34,7 @@ int _POSIX_signals_Get_highest(
       return signo;
   }
 
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
 
   for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
     if ( set & signo_to_mask( signo ) )