Ticket #342: setenv.patch

libao2/ao_sdl.c

@@ -122 +122 @@
 
 // end ring buffer stuff
 
-#if defined(__MINGW32__) || defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__))
-/* setenv is missing on win32, solaris, IRIX and HPUX */
-static void setenv(const char *name, const char *val, int _xx)
-{
-  int len  = strlen(name) + strlen(val) + 2;
-  char *env = malloc(len);
-
-  if (env != NULL) {
-    strcpy(env, name);
-    strcat(env, "=");
-    strcat(env, val);
-    putenv(env);
-  }
-}
-#endif
-
 
 // to set/get/query special features/parameters
 static int control(int cmd,void *arg){

libvo/vo_sdl.c

@@ -138 +138 @@
 #include <SDL.h>
 //#include <SDL/SDL_syswm.h>
 
-#if defined(__MINGW32__) || defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__))
-/* setenv is missing on win32, solaris, IRIX and HPUX */
-static void setenv(const char *name, const char *val, int _xx)
-{
-    int len  = strlen(name) + strlen(val) + 2;
-    char *env = malloc(len);
-
-    if (env != NULL) {
-        strcpy(env, name);
-        strcat(env, "=");
-        strcat(env, val);
-        putenv(env);
-    }
-}
-#endif
-
 
 #ifdef SDL_ENABLE_LOCKS
 #define SDL_OVR_LOCK(x)        if (SDL_LockYUVOverlay (priv->overlay)) { \

osdep/Makefile

@@ -4 +4 @@
 LIBNAME = libosdep.a
 
 SRCS= shmem.c strsep.c strl.c vsscanf.c scandir.c gettimeofday.c fseeko.c \
-      swab.c
+      swab.c setenv.c
       # timer.c
 
 getch = getch2.c

new file osdep/setenv.c

@@ +1 @@
+/* setenv implementation for systems lacking setenv in stdlib.h. */
+
+#ifndef HAVE_SETENV
+
+#include <stdlib.h>
+#include <string.h>
+
+static void setenv(const char *name, const char *val, int _xx)
+{
+    int len  = strlen(name) + strlen(val) + 2;
+    char *env = malloc(len);
+
+    if (env != NULL) {
+                          strcpy(env, name);
+                          strcat(env, "=");
+                          strcat(env, val);
+                          putenv(env);
+    }
+}
+#endif