preserve automake CFLAGS.

Mon May 11 09:56:45 1998  Tim Janik  <timj@gtk.org>

        * configure.in (cflags_set): preserve automake CFLAGS.

        * Makefile.am: fully rename the created libraries to libgtk-1.1.la
        and libgdk-1.1.la. this means we need to change certain portions of
        the Makefile.am on major/minor version bumps.

        * ltmain.sh: the -release option is not required anymore.

        * gtk/gtkobject.h (gtk_trace_referencing): compile time check the type
        of the first argument to be of type GtkObject. unconditionally compile
        this function. removed __GNUC__ dependancy of the gtk_object_ref and
        gtk_object_unref macro wrappers for this function.

Mon May 11 09:53:43 1998  Tim Janik  <timj@gtk.org>

        * configure.in: preserve automake CFLAGS.

        * Makefile.am: fully rename the created library to libglib-1.1.la.
        this means we need to change certain portions of the Makefile.am on
        major/minor version bumps.

        * ltmain.sh: the -release option is not required anymore.

        * glib.h: provide G_GNUC_FUNCTION and G_GNUC_PRETTY_FUNCTION to
        avoid conditionals. unconditionally define NULL, TRUE, FALSE, MAX,
        MIN, ABS and CLAMP, these macros might be screwed from other headers.

1 files changed, 16 insertions, 39 deletions

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index df718d432c..00f9fddbaf 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -1512,18 +1512,15 @@ gtk_object_unref (GtkObject *object)
     }
 }
 
-
-#ifdef G_ENABLE_DEBUG
 static GtkObject *gtk_trace_object = NULL;
 void
-gtk_trace_referencing (gpointer    *o,
+gtk_trace_referencing (GtkObject   *object,
 		       const gchar *func,
-		       guint	   local_frame,
+		       guint	   dummy,
 		       guint	   line,
 		       gboolean	   do_ref)
 {
   gboolean exists;
-  GtkObject *object = (GtkObject*) o;
 
   if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
     {
@@ -1535,23 +1532,20 @@ gtk_trace_referencing (gpointer    *o,
       if (exists &&
 	  (object == gtk_trace_object ||
 	   gtk_trace_object == (void*)42))
-	printf ("trace: object_%s: (%s:%p)->ref_count=%d%s (%s_f%02d:%d)\n",
-		do_ref ? "ref" : "unref",
-		gtk_type_name (GTK_OBJECT_TYPE (object)),
-		object,
-		object->ref_count,
-		do_ref ? " + 1" : " - 1 ",
-		func,
-		local_frame,
-		line);
-  
-      if (!exists)
-	printf ("trace: object_%s(%p): no such object! (%s_f%02d:%d)\n",
-		do_ref ? "ref" : "unref",
-		object,
-		func,
-		local_frame,
-		line);
+	fprintf (stdout, "trace: object_%s: (%s:%p)->ref_count=%d %s (%s:%d)\n",
+		 do_ref ? "ref" : "unref",
+		 gtk_type_name (GTK_OBJECT_TYPE (object)),
+		 object,
+		 object->ref_count,
+		 do_ref ? "+ 1" : "- 1",
+		 func,
+		 line);
+      else if (!exists)
+	fprintf (stdout, "trace: object_%s(%p): no such object! (%s:%d)\n",
+		 do_ref ? "ref" : "unref",
+		 object,
+		 func,
+		 line);
     }
   
   if (do_ref)
@@ -1559,20 +1553,3 @@ gtk_trace_referencing (gpointer    *o,
   else
     gtk_object_unref (object);
 }
-#endif /* G_ENABLE_DEBUG */
-
-/* these functions are just in place to preserve binary compatibility,
- * they should be removed when releasing 1.1.0
- */
-#undef gtk_object_data_force_id
-#undef gtk_object_data_try_key
-guint
-gtk_object_data_force_id (const gchar     *key)
-{
-  return g_dataset_force_id (key);
-}
-guint
-gtk_object_data_try_key (const gchar     *key)
-{
-  return g_dataset_try_key (key);
-}