Make sure that the locale stuff matches language.h for porting purposes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@3133 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/type.c b/scheduler/type.c
index def0bb12028abbc759a9e1a9134c860f10c1f799..39d2dc13e88f57c5416f479cd4d77e333b6ef991 100644 (file)
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: type.c,v 1.18 2002/12/17 19:00:19 swdev Exp $"
+ * "$Id: type.c,v 1.19 2003/01/24 14:43:51 mike Exp $"
  *
  *   MIME typing routines for the Common UNIX Printing System (CUPS).
  *
@@ -904,10 +904,10 @@ checkrules(const char   *filename,        /* I - Filename */
          break;
 
       case MIME_MAGIC_LOCALE :
-#ifdef __APPLE__
-          result = (strcmp(rules->value.localev, setlocale(LC_ALL, NULL)) == 0);
+#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
+          result = (strcmp(rules->value.localev, setlocale(LC_ALL, "")) == 0);
 #else
-          result = (strcmp(rules->value.localev, setlocale(LC_MESSAGES, NULL)) == 0);
+          result = (strcmp(rules->value.localev, setlocale(LC_MESSAGES, "")) == 0);
 #endif /* __APPLE__ */
          break;
 
@@ -1092,5 +1092,5 @@ patmatch(const char *s,           /* I - String to match against */
 
 
 /*
- * End of "$Id: type.c,v 1.18 2002/12/17 19:00:19 swdev Exp $".
+ * End of "$Id: type.c,v 1.19 2003/01/24 14:43:51 mike Exp $".
  */