diff options
| author | Tim Janik <timj@gtk.org> | 1998-05-11 08:31:16 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-05-11 08:31:16 +0000 |
| commit | e8df8ce17b22541b2cb4a4e00628e85f1df7441f (patch) | |
| tree | 5ecd187d297b9f1c9e6abcdd9492df019edd3bdc /gtk/gtkobject.h | |
| parent | 01003779e99dc6f0cc553993d56d876bfec60a44 (diff) | |
| download | gtk+-e8df8ce17b22541b2cb4a4e00628e85f1df7441f.tar.gz | |
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.
Diffstat (limited to 'gtk/gtkobject.h')
| -rw-r--r-- | gtk/gtkobject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 96aa844393..d41d0f6fb0 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -358,15 +358,15 @@ GtkObject* gtk_object_check_cast (GtkObject *obj, GtkObjectClass* gtk_object_check_class_cast (GtkObjectClass *klass, GtkType cast_type); -void gtk_trace_referencing (gpointer *object, +void gtk_trace_referencing (GtkObject *object, const gchar *func, - guint local_frame, + guint dummy, guint line, gboolean do_ref); -#if G_ENABLE_DEBUG && defined (__GNUC__) -# define gtk_object_ref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 1);f--;}G_STMT_END -# define gtk_object_unref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 0);f--;}G_STMT_END +#if G_ENABLE_DEBUG +# define gtk_object_ref(o) G_STMT_START{gtk_trace_referencing((o),G_GNUC_PRETTY_FUNCTION,0,__LINE__,1);}G_STMT_END +# define gtk_object_unref(o) G_STMT_START{gtk_trace_referencing((o),G_GNUC_PRETTY_FUNCTION,0,__LINE__,0);}G_STMT_END #endif /* G_ENABLE_DEBUG && __GNUC__ */ |