Mercurial > sdl-ios-xcode

diff include/SDL_stdlib.h @ 1336:3692456e7b0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use SDL_ prefixed versions of C library functions. FIXME: Change #include <stdlib.h> to #include "SDL_stdlib.h" Change #include <string.h> to #include "SDL_string.h" Make sure nothing else broke because of this...
author Sam Lantinga <slouken@libsdl.org>
date Tue, 07 Feb 2006 06:59:48 +0000
parents 450721ad5436
children d02b552e5304
line wrap: on
line diff
--- a/include/SDL_stdlib.h	Mon Feb 06 17:28:04 2006 +0000
+++ b/include/SDL_stdlib.h	Tue Feb 07 06:59:48 2006 +0000
@@ -49,9 +49,6 @@
 #endif
 
 #include "SDL_types.h"
-#include "SDL_stdarg.h"
-#include "SDL_getenv.h"
-
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
@@ -62,21 +59,18 @@
 #ifdef HAVE_MALLOC
 #define SDL_malloc	malloc
 #else
-#define malloc		SDL_malloc
 extern DECLSPEC void * SDLCALL SDL_malloc(size_t size);
 #endif
 
 #ifdef HAVE_REALLOC
 #define SDL_realloc	realloc
 #else
-#define realloc		SDL_realloc
 extern DECLSPEC void * SDLCALL SDL_realloc(void *mem, size_t size);
 #endif
 
 #ifdef HAVE_FREE
 #define SDL_free	free
 #else
-#define free		SDL_free
 extern DECLSPEC void SDLCALL SDL_free(void *mem);
 #endif
 
@@ -84,14 +78,25 @@
 #define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*count)
 #define SDL_stack_free(data)
 #else
-#define SDL_stack_alloc(type, count)    SDL_malloc(sizeof(type)*count)
+#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*count)
 #define SDL_stack_free(data)            SDL_free(data)
 #endif
 
+#ifdef HAVE_GETENV
+#define SDL_getenv	getenv
+#else
+extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
+#endif
+
+#ifdef HAVE_PUTENV
+#define SDL_putenv	putenv
+#else
+extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
+#endif
+
 #ifdef HAVE_QSORT
 #define SDL_qsort	qsort
 #else
-#define qsort		SDL_qsort
 extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
            int (*compare)(const void *, const void *));
 #endif