From 340ba90d1fdf8245b27ef9f867f242c449064de6 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Sun, 1 Aug 2004 13:28:32 +0000
Subject: [PATCH] include/strutil.h, misc/strutil.c: add str(n)icmp for carbon

---
 ChangeLog         |  2 ++
 include/strutil.h | 16 ++++++++--------
 misc/strutil.c    |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29517efa..cf6a3041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 	arch/carbon/findfile.c,	arch/carbon/SDL_main.c, arch/carbon/descent.r:
 	New files for supporting compilation with MPW for carbon (Mac OS 9).
 
+	* include/strutil.h, misc/strutil.c: add str(n)icmp for carbon
+
 2004-06-26  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
 	* main/gamemine.c, main/gamemine.h, main/gamesave.c: remove some
diff --git a/include/strutil.h b/include/strutil.h
index 4bf14129..26abc073 100644
--- a/include/strutil.h
+++ b/include/strutil.h
@@ -1,4 +1,4 @@
-/* $Id: strutil.h,v 1.10 2004-05-31 08:33:41 btb Exp $ */
+/* $Id: strutil.h,v 1.11 2004-08-01 13:28:32 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -15,13 +15,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _STRUTILS_H
 #define _STRUTILS_H
 
-#ifndef _WIN32
-#include <string.h>
-#define stricmp(a,b) strcasecmp(a,b)
-#define strnicmp(a,b,c) strncasecmp(a,b,c)
-#elif 0
-extern int stricmp(char *str1, char *str2);
-extern int strnicmp(char *str1, char *str2, int n);
+#if defined(macintosh)
+ extern int stricmp(char *str1, char *str2);
+ extern int strnicmp(char *str1, char *str2, int n);
+#elif defined(_WIN32)
+# include <string.h>
+# define stricmp(a,b) strcasecmp(a,b)
+# define strnicmp(a,b,c) strncasecmp(a,b,c)
 #endif
 
 #ifdef _WIN32_WCE
diff --git a/misc/strutil.c b/misc/strutil.c
index 2dce2657..6dbe664d 100644
--- a/misc/strutil.c
+++ b/misc/strutil.c
@@ -1,4 +1,4 @@
-/* $Id: strutil.c,v 1.9 2003-11-26 12:26:36 btb Exp $ */
+/* $Id: strutil.c,v 1.10 2004-08-01 13:28:32 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "error.h"
 
-#if 0
+#ifdef macintosh
 // string compare without regard to case
 
 int stricmp( char *s1, char *s2 )
-- 
2.39.2