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>
This commit is contained in:
Mark Crichton 1998-07-25 20:16:56 +00:00
parent ce85619724
commit a87caec45b
10 changed files with 50 additions and 2 deletions

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

View File

@ -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> Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h: * glib.h:

2
glib.h
View File

@ -449,7 +449,7 @@ typedef unsigned long long guint64;
typedef gint32 gssize; typedef gint32 gssize;
typedef guint32 gsize; typedef guint32 gsize;
typedef gint32 gtime; typedef gint32 g_time;
typedef guint32 GQuark; typedef guint32 GQuark;
typedef struct _GList GList; typedef struct _GList GList;

View File

@ -449,7 +449,7 @@ typedef unsigned long long guint64;
typedef gint32 gssize; typedef gint32 gssize;
typedef guint32 gsize; typedef guint32 gsize;
typedef gint32 gtime; typedef gint32 g_time;
typedef guint32 GQuark; typedef guint32 GQuark;
typedef struct _GList GList; typedef struct _GList GList;