summaryrefslogtreecommitdiff
path: root/glib/gmem.c
diff options
context:
space:
mode:
authorRaja R Harinath <harinath@src.gnome.org>1998-11-01 01:32:59 +0000
committerRaja R Harinath <harinath@src.gnome.org>1998-11-01 01:32:59 +0000
commit5900267cc7bfe0641709d43eaba28f6b0ff7ab0d (patch)
tree15f666ee4baab89821d62838d7e6141ca02459a3 /glib/gmem.c
parente8a920f88d5e6f534f20f04681e5cc33dba8239f (diff)
downloadglib-5900267cc7bfe0641709d43eaba28f6b0ff7ab0d.tar.gz
Land glib-rrh-19981025-0.patch.
* Makefile.am (glibconfig.h): New rule. (stamp-gc-h): New rule. Generate `glibconfig.h'. * configure.in (AM_CONFIG_HEADER): It is now `config.h'. (HAVE_BROKEN_WCTYPE): On Solaris, look for iswalnum in -lw before concluding "broken wctype". (glibconfig.h): Use AC_OUTPUT_COMMANDS to put generation code into config.status. * glib.h: Remove a lot of tests and defines. All these have been moved to `configure.in (glibconfig.h)'. * gerror.c: Include <config.h>. * gmem.c: Likewise. * gstrfuncs.c: Likewise. * gutils.c: Likewise. This could cause some short term instability.
Diffstat (limited to 'glib/gmem.c')
-rw-r--r--glib/gmem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/glib/gmem.c b/glib/gmem.c
index 179d8d213..cd7f47ea9 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -16,6 +16,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
#include "glib.h"