From 871c2bcf656993d7728626bed736ff774a4d69fe Mon Sep 17 00:00:00 2001
From: guillemj <>
Date: Sun, 3 Dec 2006 04:49:19 +0000
Subject: [PATCH] Backport "sequence point" fix for string upper code from
 glide3x.

---
 glide2x/cvg/glide/src/g3df.c | 18 ++++++++----------
 glide2x/h3/glide/src/g3df.c  | 18 ++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/glide2x/cvg/glide/src/g3df.c b/glide2x/cvg/glide/src/g3df.c
index e95327d..0a027fb 100644
--- a/glide2x/cvg/glide/src/g3df.c
+++ b/glide2x/cvg/glide/src/g3df.c
@@ -19,6 +19,9 @@
 **
 ** $Header$
 ** $Log$
+** Revision 1.1.1.1.2.1  2004/12/12 15:20:35  koolsmoky
+** use toupper for __MSC__
+**
 ** Revision 1.1.1.1  1999/12/07 21:49:09  joseph
 ** Initial checkin into SourceForge.
 **
@@ -300,18 +303,13 @@ GR_DIENTRY(gu3dfGetInfo, FxBool,
   /*
   ** determine the color format of the input image
   */
-#if defined(__GNUC__) || defined(__MSC__)
-  /* This function is not found in libgcc.a */
   {
-    char* tempStr = (char*)color_format;
-    while(*tempStr != '\0') *tempStr++ = toupper(*tempStr);
+    char *tempStr = (char*)color_format;
+    while (*tempStr != '\0') {
+          *tempStr = toupper(*tempStr);
+          tempStr++;
+    }
   }
-#else
-  {
-    extern char* strupr(char*);
-    strupr(color_format);
-  }
-#endif /* __GNUC__ */
 
   i = 0;
   format_found = FXFALSE;
diff --git a/glide2x/h3/glide/src/g3df.c b/glide2x/h3/glide/src/g3df.c
index e0f443b..0ec1392 100644
--- a/glide2x/h3/glide/src/g3df.c
+++ b/glide2x/h3/glide/src/g3df.c
@@ -19,6 +19,9 @@
 **
 ** $Header$
 ** $Log$
+** Revision 1.2  2000/10/03 18:29:55  mercury
+** 003-clean_up_h3-000, h3 tree cleanup.
+**
 ** Revision 1.1.1.1  1999/12/07 21:49:27  joseph
 ** Initial checkin into SourceForge.
 **
@@ -299,18 +302,13 @@ GR_DIENTRY(gu3dfGetInfo, FxBool,
   /*
   ** determine the color format of the input image
   */
-#ifdef __GNUC__
-  /* This function is not found in libgcc.a */
   {
-    char* tempStr = (char*)color_format;
-    while(*tempStr != '\0') *tempStr++ = toupper(*tempStr);
+    char *tempStr = (char*)color_format;
+    while (*tempStr != '\0') {
+          *tempStr = toupper(*tempStr);
+          tempStr++;
+    }
   }
-#else
-        {
-                extern char* strupr(char*);
-        strupr(color_format);
-  }
-#endif /* __GNUC__ */
 
   i = 0;
   format_found = FXFALSE;