diff options
| author | Manish Singh <yosh@src.gnome.org> | 1999-10-04 19:03:05 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 1999-10-04 19:03:05 +0000 |
| commit | 3b348f74e9b5b8bf4568ddff81f148850bb4fe57 (patch) | |
| tree | 016a99f5f3944f86f7be626a13a1a23377b098c0 /gtk/fnmatch.c | |
| parent | 0fef3d2f6d91ca0d89c086092462ee968ae4810e (diff) | |
| download | gtk+-3b348f74e9b5b8bf4568ddff81f148850bb4fe57.tar.gz | |
correct checking for BeOS check
* configure.in: correct checking for BeOS check
* gdk/gdktypes.h
* gtk/fnmatch.c
* gtk/gtkfilesel.c
* gtk/gtkitemfactory.c
* gtk/gtkmain.[ch]
* gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
-Yosh
Diffstat (limited to 'gtk/fnmatch.c')
| -rw-r--r-- | gtk/fnmatch.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c index 757cddb36e..614c014e79 100644 --- a/gtk/fnmatch.c +++ b/gtk/fnmatch.c @@ -36,7 +36,7 @@ #endif #include "fnmatch.h" -/* We need glib.h for G_DIR_SEPARATOR, WIN32 and NATIVE_WIN32 */ +/* We need glib.h for G_DIR_SEPARATOR and G_OS_WIN32 */ #include <glib.h> #include <ctype.h> @@ -67,7 +67,7 @@ fnmatch (pattern, string, flags) register char c; /* Note that this evalutes C many times. */ -#ifndef WIN32 +#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) #define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c)) #else #define FOLD(c) (tolower (c)) @@ -88,7 +88,7 @@ fnmatch (pattern, string, flags) (n == string || ((flags & FNM_FILE_NAME) && n[-1] == G_DIR_SEPARATOR))) return FNM_NOMATCH; break; -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 case '\\': if (!(flags & FNM_NOESCAPE)) { @@ -113,7 +113,7 @@ fnmatch (pattern, string, flags) return 0; { -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; #else char c1 = c; @@ -146,7 +146,7 @@ fnmatch (pattern, string, flags) for (;;) { register char cstart = c, cend = c; -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 if (!(flags & FNM_NOESCAPE) && c == '\\') cstart = cend = *p++; #endif @@ -166,7 +166,7 @@ fnmatch (pattern, string, flags) if (c == '-' && *p != ']') { cend = *p++; -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 if (!(flags & FNM_NOESCAPE) && cend == '\\') cend = *p++; #endif @@ -196,7 +196,7 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; c = *p++; -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 if (!(flags & FNM_NOESCAPE) && c == '\\') /* XXX 1003.2d11 is unclear if this is right. */ ++p; |