Win32: Fixed build; added strcasestr()

It seems the Windows C runtime library doesn't include strcasestr().
skyjake · Mar 7, 2012 · 4eec14b · 4eec14b
1 parent de6b747
commit 4eec14b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/doomsday/engine/portable/include/de_platform.h b/doomsday/engine/portable/include/de_platform.h
@@ -64,6 +64,8 @@
 #define strdup _strdup
 #define spawnlp _spawnlp
 
+const char* strcasestr(const char* text, const char* sub);
+
 #endif                          // WIN32
 
 /*

diff --git a/doomsday/engine/portable/src/r_model.c b/doomsday/engine/portable/src/r_model.c
@@ -1178,6 +1178,8 @@ static int destroyModelInRepository(StringPoolId id, void* parm)
     }
     M_Free(m->vertexUsage);
     M_Free(m);
+
+    return 0;
 }
 
 static void clearModelList(void)

diff --git a/doomsday/engine/win32/src/dd_winit.c b/doomsday/engine/win32/src/dd_winit.c
@@ -646,3 +646,20 @@ void DD_Shutdown(void)
     free(utf8ConvBuf); utf8ConvBuf = 0;
 #endif
 }
+
+/**
+ * Windows implementation for the *nix strcasestr() function.
+ */
+const char* strcasestr(const char *text, const char *sub)
+{
+    int textLen = strlen(text);
+    int subLen = strlen(sub);
+    int i;
+
+    for(i = 0; i < textLen - subLen; ++i)
+    {
+        const char* start = text + i;
+        if(!strnicmp(start, sub, subLen)) return start;
+    }
+    return 0;
+}