Started the process of improving configure support, and merging C types

and library support into a single header.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401357

include/SDL_cdrom.h

@@ -25,8 +25,9 @@
 #ifndef _SDL_cdrom_h
 #define _SDL_cdrom_h
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 
+#ifndef DISABLE_CDROM
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -166,5 +167,6 @@ extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
 }
 #endif
 #include "close_code.h"
+#endif /* !DISABLE_CDROM */
 
 #endif /* _SDL_video_h */