A few fixes to get this building on Linux again
authorSam Lantinga <slouken@libsdl.org>
Mon, 06 Feb 2006 08:46:14 +0000
changeset 13311cbaeee565b1
parent 1330 450721ad5436
child 1332 de3d552b59b2
A few fixes to get this building on Linux again
include/SDL_config.h
src/audio/alsa/SDL_alsa_audio.c
src/stdlib/SDL_getenv.c
src/stdlib/SDL_qsort.c
src/stdlib/SDL_stdlib.c
     1.1 --- a/include/SDL_config.h	Mon Feb 06 08:28:51 2006 +0000
     1.2 +++ b/include/SDL_config.h	Mon Feb 06 08:46:14 2006 +0000
     1.3 @@ -32,14 +32,26 @@
     1.4  #ifdef HAVE_LIBC
     1.5  
     1.6  /* Various C library headers */
     1.7 +#ifndef HAVE_CTYPE_H
     1.8  #define HAVE_CTYPE_H
     1.9 +#endif
    1.10 +#ifndef HAVE_STDIO_H
    1.11  #define HAVE_STDIO_H
    1.12 +#endif
    1.13 +#ifndef HAVE_STDLIB_H
    1.14  #define HAVE_STDLIB_H
    1.15 +#endif
    1.16 +#ifndef HAVE_MALLOC_H
    1.17  #define HAVE_MALLOC_H
    1.18 +#endif
    1.19 +#ifndef HAVE_STRING_H
    1.20  #define HAVE_STRING_H
    1.21 +#endif
    1.22  #if !defined(_WIN32_WCE)
    1.23 +#ifndef HAVE_SIGNAL_H
    1.24  #define HAVE_SIGNAL_H
    1.25  #endif
    1.26 +#endif /* !_WIN32_WCE */
    1.27  
    1.28  /* Features provided by SDL_stdlib.h */
    1.29  #if !defined(_WIN32) /* Don't use C runtime versions of these on Windows */
    1.30 @@ -49,7 +61,9 @@
    1.31  #define HAVE_MALLOC
    1.32  #define HAVE_REALLOC
    1.33  #define HAVE_FREE
    1.34 +#ifndef HAVE_ALLOCA
    1.35  #define HAVE_ALLOCA
    1.36 +#endif
    1.37  /*#define HAVE_QSORT*/
    1.38  
    1.39  /* Features provided by SDL_string.h */
     2.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Mon Feb 06 08:28:51 2006 +0000
     2.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Mon Feb 06 08:46:14 2006 +0000
     2.3 @@ -43,8 +43,10 @@
     2.4  
     2.5  #ifdef ALSA_DYNAMIC
     2.6  #ifdef USE_DLVSYM
     2.7 +#ifndef __USE_GNU
     2.8  #define __USE_GNU
     2.9  #endif
    2.10 +#endif
    2.11  #include <dlfcn.h>
    2.12  #include "SDL_name.h"
    2.13  #include "SDL_loadso.h"
     3.1 --- a/src/stdlib/SDL_getenv.c	Mon Feb 06 08:28:51 2006 +0000
     3.2 +++ b/src/stdlib/SDL_getenv.c	Mon Feb 06 08:46:14 2006 +0000
     3.3 @@ -23,6 +23,7 @@
     3.4  #include "SDL_stdlib.h"
     3.5  #include "SDL_string.h"
     3.6  
     3.7 +#ifndef HAVE_GETENV
     3.8  
     3.9  #if defined(WIN32) && !defined(_WIN32_WCE)
    3.10  
    3.11 @@ -173,6 +174,8 @@
    3.12  
    3.13  #endif /* WIN32 */
    3.14  
    3.15 +#endif /* !HAVE_GETENV */
    3.16 +
    3.17  #ifdef TEST_MAIN
    3.18  #include <stdio.h>
    3.19  
     4.1 --- a/src/stdlib/SDL_qsort.c	Mon Feb 06 08:28:51 2006 +0000
     4.2 +++ b/src/stdlib/SDL_qsort.c	Mon Feb 06 08:46:14 2006 +0000
     4.3 @@ -415,4 +415,4 @@
     4.4      qsort_words(base,nmemb,compare);
     4.5  }
     4.6  
     4.7 -#endif /* !HAVE_QSORT */
     4.8 \ No newline at end of file
     4.9 +#endif /* !HAVE_QSORT */
     5.1 --- a/src/stdlib/SDL_stdlib.c	Mon Feb 06 08:28:51 2006 +0000
     5.2 +++ b/src/stdlib/SDL_stdlib.c	Mon Feb 06 08:46:14 2006 +0000
     5.3 @@ -67,4 +67,4 @@
     5.4  
     5.5  #endif /* MSC_VER */
     5.6  
     5.7 -#endif /* !HAVE_LIBC */
     5.8 \ No newline at end of file
     5.9 +#endif /* !HAVE_LIBC */