Skip to content
Permalink
Browse files

A few fixes to get this building on Linux again

  • Loading branch information
slouken committed Feb 6, 2006
1 parent 5a96984 commit 1ea1a4bbf49bfc3b29bed5b8b3d67eed6628445d
Showing with 21 additions and 2 deletions.
  1. +14 −0 include/SDL_config.h
  2. +2 −0 src/audio/alsa/SDL_alsa_audio.c
  3. +3 −0 src/stdlib/SDL_getenv.c
  4. +1 −1 src/stdlib/SDL_qsort.c
  5. +1 −1 src/stdlib/SDL_stdlib.c
@@ -32,14 +32,26 @@
#ifdef HAVE_LIBC

/* Various C library headers */
#ifndef HAVE_CTYPE_H
#define HAVE_CTYPE_H
#endif
#ifndef HAVE_STDIO_H
#define HAVE_STDIO_H
#endif
#ifndef HAVE_STDLIB_H
#define HAVE_STDLIB_H
#endif
#ifndef HAVE_MALLOC_H
#define HAVE_MALLOC_H
#endif
#ifndef HAVE_STRING_H
#define HAVE_STRING_H
#endif
#if !defined(_WIN32_WCE)
#ifndef HAVE_SIGNAL_H
#define HAVE_SIGNAL_H
#endif
#endif /* !_WIN32_WCE */

/* Features provided by SDL_stdlib.h */
#if !defined(_WIN32) /* Don't use C runtime versions of these on Windows */
@@ -49,7 +61,9 @@
#define HAVE_MALLOC
#define HAVE_REALLOC
#define HAVE_FREE
#ifndef HAVE_ALLOCA
#define HAVE_ALLOCA
#endif
/*#define HAVE_QSORT*/

/* Features provided by SDL_string.h */
@@ -43,8 +43,10 @@

#ifdef ALSA_DYNAMIC
#ifdef USE_DLVSYM
#ifndef __USE_GNU
#define __USE_GNU
#endif
#endif
#include <dlfcn.h>
#include "SDL_name.h"
#include "SDL_loadso.h"
@@ -23,6 +23,7 @@
#include "SDL_stdlib.h"
#include "SDL_string.h"

#ifndef HAVE_GETENV

#if defined(WIN32) && !defined(_WIN32_WCE)

@@ -173,6 +174,8 @@ char *SDL_getenv(const char *name)

#endif /* WIN32 */

#endif /* !HAVE_GETENV */

#ifdef TEST_MAIN
#include <stdio.h>

@@ -415,4 +415,4 @@ void SDL_qsort(void *base, size_t nmemb, size_t size,
qsort_words(base,nmemb,compare);
}

#endif /* !HAVE_QSORT */
#endif /* !HAVE_QSORT */
@@ -67,4 +67,4 @@ void _aullshr()

#endif /* MSC_VER */

#endif /* !HAVE_LIBC */
#endif /* !HAVE_LIBC */

0 comments on commit 1ea1a4b

Please sign in to comment.