Commented out the MEM_PROFILE and MEM_CHECK from gmem.c, causing problems

with GdkImages.

Updates some .cvsignores

-Yosh

diff --git a/gdk/.cvsignore b/gdk/.cvsignore
index bf7462512ed79bc4bc2f9243ce2f22bb42df9b26..5fc22a64bd8e5d7883e40dff0190739cd339522f 100644 (file)
--- a/gdk/.cvsignore
+++ b/gdk/.cvsignore
@@ -4,6 +4,6 @@ Makefile.in
 .deps
 _libs
 .libs
-libgdk.la
+libgdk-1.1.la
 gdkcursors.h
 gdkkeysyms.h

diff --git a/glib/.cvsignore b/glib/.cvsignore
index fb21b2098d3a53817abc5c9057b45278e182c5b9..b03d5fc0748cb0a11b50956f6f321925776ab5ed 100644 (file)
--- a/glib/.cvsignore
+++ b/glib/.cvsignore
@@ -5,7 +5,7 @@ configure
 aclocal.m4
 .deps
 _libs
-libglib.la
+libglib-1.1.la
 config.log
 glibconfig.h
 glib.h

diff --git a/glib/ChangeLog b/glib/ChangeLog
index 907b5455c27a3aed6e87af3b4f09da05be73068e..48a162ede31d1663002ee9caadf023e0b09310ef 100644 (file)
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  6 14:09:22 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gmem.c: commented out MEM_PROFILE and MEM_CHECK, causing weird
+       problems
+
 Mon Jun  1 04:43:27 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_insert): wrote a comment describing why

diff --git a/glib/gmem.c b/glib/gmem.c
index 5d51a856b66be69754c3c177764a2e47578099cc..27f0cf900c31af965d7ad58b66eca80baebce79d 100644 (file)
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -21,8 +21,8 @@
 #include "glib.h"
 
 
-#define MEM_PROFILE
-#define MEM_CHECK
+/* #define MEM_PROFILE */
+/* #define MEM_CHECK */
 
 
 #define MAX_MEM_AREA  65536L

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 94ab179c28d2b0e44c27e4b9967941ba423d1279..967962f4be3ffc73b9dfe87cb1969343e7815f47 100644 (file)
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -4,10 +4,11 @@ Makefile.in
 .deps
 _libs
 .libs
-libgtk.la
+libgtk-1.1.la
 testgtk
 testinput
 testselection
 simple
 testtree
 gtkfeatures.h
+testthreads