[Sumover-dev] [svn commit] r4450 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Jun  4 11:20:25 2009
New Revision: 4450

Modified:
   vic/branches/mpeg4/strtol.c
   vic/branches/mpeg4/strtoul.c

Log:
Added #ifndef HAVE_STDLIB_H to these files so they're not used when stdlib is present (ie in the case of compilation with mingw)

Modified: vic/branches/mpeg4/strtol.c
==============================================================================
--- vic/branches/mpeg4/strtol.c	(original)
+++ vic/branches/mpeg4/strtol.c	Thu Jun  4 11:20:25 2009
@@ -23,6 +23,8 @@
  * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
+#ifndef HAVE_STDLIB_H
+
 static const char rcsid[] = "$Header$ SPRITE (Berkeley)";
 
 #include <ctype.h>
@@ -94,3 +96,4 @@
     }
     return result;
 }
+#endif
\ No newline at end of file

Modified: vic/branches/mpeg4/strtoul.c
==============================================================================
--- vic/branches/mpeg4/strtoul.c	(original)
+++ vic/branches/mpeg4/strtoul.c	Thu Jun  4 11:20:25 2009
@@ -23,6 +23,8 @@
  * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
+#ifndef HAVE_STDLIB_H
+
 static const char rcsid[] = "$Header$ SPRITE (Berkeley)";
 
 #include <ctype.h>
@@ -187,3 +189,4 @@
     }
     return result;
 }
+#endif
\ No newline at end of file