From a87caec45b51efd22393043ca6b665bcbbde5f3a Mon Sep 17 00:00:00 2001 From: Mark Crichton Date: Sat, 25 Jul 1998 20:16:56 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib.h | 2 +- glib/glib.h | 2 +- 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ee5bd8ea..02dea9eb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jul 25 16:09:00 1998 Mark Crichton + + * 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 * glib.h: diff --git a/glib.h b/glib.h index 6436295a..4719e0ae 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 6436295a..4719e0ae 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; -- 2.34.1