src/SDL.c
changeset 4472 791b3256fb22
parent 4419 5e7e1f1a4056
child 5062 e8916fe9cfc8
     1.1 --- a/src/SDL.c	Thu Jun 17 22:23:20 2010 -0700
     1.2 +++ b/src/SDL.c	Sat Jun 26 08:56:48 2010 -0700
     1.3 @@ -25,21 +25,15 @@
     1.4  
     1.5  #include "SDL.h"
     1.6  #include "SDL_fatal.h"
     1.7 -#include "SDL_assert.h"
     1.8 +#include "SDL_assert_c.h"
     1.9 +#include "haptic/SDL_haptic_c.h"
    1.10 +#include "joystick/SDL_joystick_c.h"
    1.11  
    1.12  #if !SDL_VIDEO_DISABLED
    1.13  #include "video/SDL_leaks.h"
    1.14  #endif
    1.15  
    1.16  /* Initialization/Cleanup routines */
    1.17 -#if !SDL_JOYSTICK_DISABLED
    1.18 -extern int SDL_JoystickInit(void);
    1.19 -extern void SDL_JoystickQuit(void);
    1.20 -#endif
    1.21 -#if !SDL_HAPTIC_DISABLED
    1.22 -extern int SDL_HapticInit(void);
    1.23 -extern int SDL_HapticQuit(void);
    1.24 -#endif
    1.25  #if !SDL_TIMERS_DISABLED
    1.26  extern void SDL_StartTicks(void);
    1.27  extern int SDL_TimerInit(void);
    1.28 @@ -50,8 +44,6 @@
    1.29  extern int SDL_HelperWindowDestroy(void);
    1.30  #endif
    1.31  
    1.32 -extern int SDL_AssertionsInit(void);
    1.33 -extern void SDL_AssertionsQuit(void);
    1.34  
    1.35  /* The initialized subsystems */
    1.36  static Uint32 SDL_initialized = 0;