diff options
| author | Raja R Harinath <harinath@src.gnome.org> | 1998-11-01 01:44:05 +0000 |
|---|---|---|
| committer | Raja R Harinath <harinath@src.gnome.org> | 1998-11-01 01:44:05 +0000 |
| commit | f2fe3fe2216f8d65b7dd919a85fcefa305bb691f (patch) | |
| tree | ec5e40f4fd71e9a2f4ca3807b5c279de6f79234d /gdk | |
| parent | 704266d64684b90bbb82dfe5485cdb207f4b320c (diff) | |
| download | gtk+-f2fe3fe2216f8d65b7dd919a85fcefa305bb691f.tar.gz | |
Remove `#pragma }'.
* gtk/gtkfeatures.h.in: Remove `#pragma }'.
* gdk/gdki18n.h: Update to use new `glib' widechar defines.
* configure.in (CFLAGS): Don't use test -z "echo .. | grep". Use
case instead.
(wchar.h, wctype.h, iswalnum): Duplicate widechar tests from `glib'.
(GDK_WLIBS): New variable. Lists extra libraries needed to use
widechar functions.
* gtk-config.in (--libs): List $GDK_WLIBS, too.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdki18n.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/gdki18n.h b/gdk/gdki18n.h index 9cd1ba9778..f2bf8553df 100644 --- a/gdk/gdki18n.h +++ b/gdk/gdki18n.h @@ -146,11 +146,11 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len); #endif /* X_LOCALE */ -#if !defined(HAVE_BROKEN_WCTYPE) && (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) && !defined(X_LOCALE) -# ifdef HAVE_WCTYPE_H +#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE) +# ifdef G_HAVE_WCTYPE_H # include <wctype.h> # else -# ifdef HAVE_WCHAR_H +# ifdef G_HAVE_WCHAR_H # include <wchar.h> # endif # endif |