Mercurial > mxe-octave

view src/units-1-fixes.patch @ 3554:b1ca68ddd02c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build native-gcc using untared dependancies within gcc source tree * src/native-gcc.mk: untar gmp, mpc, mpfr, cloog and isl into the gcc source tree before configure and build, set sysroot. * src/native-binutils.mk: set sysroot path. * src/mingw-w64-1-math-h.patch, mingw-w64-2-float-h.patch: New files.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 21 Feb 2014 06:05:39 -0500
parents e7cb2340feff
children
line wrap: on
line source

--- a/units.c.orig	2013-10-21 11:47:34 -0400
+++ b/units.c	2013-10-21 12:18:24 -0400
@@ -1166,23 +1166,23 @@
 int
 setenv(const char *name, const char *val, int overwrite)
 {
-  char *environ;
+  char *environ1;
 
   if (!overwrite && getenv(name) != NULL)
     return 0;
-  environ = (char *) malloc(strlen(name) + strlen(val) + 2);
-  if (!environ)
+  environ1 = (char *) malloc(strlen(name) + strlen(val) + 2);
+  if (!environ1)
     return 1;
-  strcpy(environ, name);
-  strcat(environ, "=");
-  strcat(environ, val);
+  strcpy(environ1, name);
+  strcat(environ1, "=");
+  strcat(environ1, val);
 
   /* putenv() doesn't copy its argument, so don't free environ */
 
 #if defined _WIN32 && defined _MSC_VER
-  return _putenv(environ);
+  return _putenv(environ1);
 #else
-  return putenv(environ);
+  return putenv(environ1);
 #endif
 }
 #endif