* misc/Makefile (headers): Rename queue.h to sys/queue.h.

	* misc/queue.h: Moved to misc/sys/queue.h.

diff --git a/ChangeLog b/ChangeLog
index 50785a204f7ac6c7f0adc1b2a4b3b907eb6d2de5..761fb90342222dbfcc1c01812b83ed51266f57ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Jan 21 00:55:25 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+       * misc/Makefile (headers): Rename queue.h to sys/queue.h.
+       * misc/queue.h: Moved to misc/sys/queue.h.
+
        * sysdeps/unix/sysv/linux/shmat.c: Include sys/shm.h instead of
        sys/sem.h.
 

diff --git a/misc/Makefile b/misc/Makefile
index 4a5546634eeaab7e361e35d5153233d8b6ee434b..2de6dd16174b5b45673a919d3fe0ec39bb97c338 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -26,7 +26,7 @@ headers       := sys/uio.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h       \
           a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \
           ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \
           sys/mman.h sys/param.h fstab.h mntent.h search.h utmp.h       \
-          err.h error.h queue.h
+          err.h error.h sys/queue.h
 
 routines := brk sbrk sstk ioctl \
            readv writev \

diff --git a/misc/error.c b/misc/error.c
index cdba47065604502bd1e05d33b3f4168e88b9897e..c48c0f3c46e6833f530ab5cc543705a8eb8aa431 100644 (file)
--- a/misc/error.c
+++ b/misc/error.c
@@ -50,7 +50,11 @@ void exit ();
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
-void (*error_print_progname) ();
+void (*error_print_progname) (
+#if __STDC__
+                             void
+#endif
+                             );
 
 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;

diff --git a/misc/queue.h b/misc/sys/queue.h
similarity index 100%
rename from misc/queue.h
rename to misc/sys/queue.h

diff --git a/sys/queue.h b/sys/queue.h
new file mode 100644 (file)
index 0000000..5c9823b
--- /dev/null
+++ b/sys/queue.h
@@ -0,0 +1 @@
+#include <misc/sys/queue.h>