1.1 --- a/src/SDL.c Sat Sep 05 09:03:35 2009 +0000
1.2 +++ b/src/SDL.c Sat Sep 05 09:11:03 2009 +0000
1.3 @@ -42,10 +42,6 @@
1.4 extern int SDL_HapticInit(void);
1.5 extern int SDL_HapticQuit(void);
1.6 #endif
1.7 -#if !SDL_CDROM_DISABLED
1.8 -extern int SDL_CDROMInit(void);
1.9 -extern void SDL_CDROMQuit(void);
1.10 -#endif
1.11 #if !SDL_TIMERS_DISABLED
1.12 extern void SDL_StartTicks(void);
1.13 extern int SDL_TimerInit(void);
1.14 @@ -145,22 +141,6 @@
1.15 return (-1);
1.16 }
1.17 #endif
1.18 -
1.19 -
1.20 -#if !SDL_CDROM_DISABLED
1.21 - /* Initialize the CD-ROM subsystem */
1.22 - if ((flags & SDL_INIT_CDROM) && !(SDL_initialized & SDL_INIT_CDROM)) {
1.23 - if (SDL_CDROMInit() < 0) {
1.24 - return (-1);
1.25 - }
1.26 - SDL_initialized |= SDL_INIT_CDROM;
1.27 - }
1.28 -#else
1.29 - if (flags & SDL_INIT_CDROM) {
1.30 - SDL_SetError("SDL not built with cdrom support");
1.31 - return (-1);
1.32 - }
1.33 -#endif
1.34 return (0);
1.35 }
1.36
1.37 @@ -198,12 +178,6 @@
1.38 SDL_QuitSubSystem(Uint32 flags)
1.39 {
1.40 /* Shut down requested initialized subsystems */
1.41 -#if !SDL_CDROM_DISABLED
1.42 - if ((flags & SDL_initialized & SDL_INIT_CDROM)) {
1.43 - SDL_CDROMQuit();
1.44 - SDL_initialized &= ~SDL_INIT_CDROM;
1.45 - }
1.46 -#endif
1.47 #if !SDL_JOYSTICK_DISABLED
1.48 if ((flags & SDL_initialized & SDL_INIT_JOYSTICK)) {
1.49 SDL_JoystickQuit();