From f2f7f9e665975125ef253d7a621bcc3e4f68904d Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 22 Jan 1996 10:00:24 +0000
Subject: [PATCH] * misc/Makefile (headers): Rename queue.h to sys/queue.h.

	* misc/queue.h: Moved to misc/sys/queue.h.
---
 ChangeLog              | 3 +++
 misc/Makefile          | 2 +-
 misc/error.c           | 6 +++++-
 misc/{ => sys}/queue.h | 0
 sys/queue.h            | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)
 rename misc/{ => sys}/queue.h (100%)
 create mode 100644 sys/queue.h

diff --git a/ChangeLog b/ChangeLog
index 50785a204f..761fb90342 100644
--- 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 4a5546634e..2de6dd1617 100644
--- 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 cdba470656..c48c0f3c46 100644
--- 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
index 0000000000..5c9823b7eb
--- /dev/null
+++ b/sys/queue.h
@@ -0,0 +1 @@
+#include <misc/sys/queue.h>