It's GTime now, and it's back!

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6d9e608..e5e696a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Aug 10 17:56:11 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: it's GTime now, and it's back!
+
 Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build

diff --git a/glib.h b/glib.h
index 03d8ae0..1cd431a 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -450,10 +450,7 @@ typedef unsigned long long guint64;
 typedef gint32 gssize;
 typedef guint32 gsize;
 typedef guint32 GQuark;
-
-#if 0
 typedef gint32 GTime;
-#endif
 
 typedef struct _GList          GList;
 typedef struct _GSList         GSList;

diff --git a/glib/glib.h b/glib/glib.h
index 03d8ae0..1cd431a 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -450,10 +450,7 @@ typedef unsigned long long guint64;
 typedef gint32 gssize;
 typedef guint32 gsize;
 typedef guint32 GQuark;
-
-#if 0
 typedef gint32 GTime;
-#endif
 
 typedef struct _GList          GList;
 typedef struct _GSList         GSList;