DANGER WILL ROBINSON! Ok, normally I don't do things like this, but this

DANGER WILL ROBINSON!
Ok, normally I don't do things like this, but this one is simple to reverse.
On NetBSD, /usr/include/time.h defines gtime.  This conflicts with gtime in
glib.h.  HENCE, I changed the glib.h gtime to g_time.  If this is wrong, please
put in a more proper fix.

Thanks,
Mark Crichton
<mcrichto@purdue.edu>

10 files changed, 50 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ee5bd8eac..02dea9ebc 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jul 25 16:09:00 1998  Mark Crichton <crichton@expert.cc.purdue.edu>
+	
+	* glib.h: gtime changed to g_time.  gtime is used in 
+	/usr/include/time.h in NetBSD, causing multiple headaches.
+	If this isn't the right way of fixing it.... ;)
+
 Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>
 
 	* glib.h: 
diff --git a/glib.h b/glib.h
index 6436295a4..4719e0ae3 100644
--- a/glib.h
+++ b/glib.h
@@ -449,7 +449,7 @@ typedef unsigned long long guint64;
 
 typedef gint32	gssize;
 typedef guint32 gsize;
-typedef gint32	gtime;
+typedef gint32	g_time;
 typedef guint32 GQuark;
 
 typedef struct _GList		GList;
diff --git a/glib/glib.h b/glib/glib.h
index 6436295a4..4719e0ae3 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -449,7 +449,7 @@ typedef unsigned long long guint64;
 
 typedef gint32	gssize;
 typedef guint32 gsize;
-typedef gint32	gtime;
+typedef gint32	g_time;
 typedef guint32 GQuark;
 
 typedef struct _GList		GList;