Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*** empty log message ***
  • Loading branch information
slouken committed Feb 10, 2006
1 parent f97e96e commit 3d4edde
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 30 deletions.
1 change: 0 additions & 1 deletion include/SDL.h
Expand Up @@ -26,7 +26,6 @@
#define _SDL_H

#include "SDL_stdinc.h"
#include "SDL_main.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_timer.h"
Expand Down
2 changes: 0 additions & 2 deletions include/SDL_active.h
Expand Up @@ -27,7 +27,6 @@

#include "SDL_stdinc.h"

#ifndef DISABLE_EVENTS
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand All @@ -54,6 +53,5 @@ extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
}
#endif
#include "close_code.h"
#endif /* !DISABLE_EVENTS */

#endif /* _SDL_active_h */
5 changes: 1 addition & 4 deletions include/SDL_audio.h
Expand Up @@ -26,12 +26,10 @@
#define _SDL_audio_h

#include "SDL_stdinc.h"
#include "SDL_main.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_byteorder.h"
#include "SDL_endian.h"

#ifndef DISABLE_AUDIO
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down Expand Up @@ -249,6 +247,5 @@ extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
}
#endif
#include "close_code.h"
#endif /* !DISABLE_AUDIO */

#endif /* _SDL_audio_h */
2 changes: 0 additions & 2 deletions include/SDL_cdrom.h
Expand Up @@ -27,7 +27,6 @@

#include "SDL_stdinc.h"

#ifndef DISABLE_CDROM
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down Expand Up @@ -167,6 +166,5 @@ extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
}
#endif
#include "close_code.h"
#endif /* !DISABLE_CDROM */

#endif /* _SDL_video_h */
2 changes: 0 additions & 2 deletions include/SDL_cpuinfo.h
Expand Up @@ -28,7 +28,6 @@
#ifndef _SDL_cpuinfo_h
#define _SDL_cpuinfo_h

#ifndef DISABLE_CPUINFO
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down Expand Up @@ -72,6 +71,5 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec();
}
#endif
#include "close_code.h"
#endif /* !DISABLE_CPUINFO */

#endif /* _SDL_cpuinfo_h */
2 changes: 2 additions & 0 deletions include/SDL_error.h
Expand Up @@ -25,6 +25,8 @@
#ifndef _SDL_error_h
#define _SDL_error_h

#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_events.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_events_h
#define _SDL_events_h

#include "SDL_types.h"
#include "SDL_stdinc.h"
#include "SDL_active.h"
#include "SDL_keyboard.h"
#include "SDL_mouse.h"
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_joystick.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_joystick_h
#define _SDL_joystick_h

#include "SDL_types.h"
#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_keyboard.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_keyboard_h
#define _SDL_keyboard_h

#include "SDL_types.h"
#include "SDL_stdinc.h"
#include "SDL_keysym.h"

#include "begin_code.h"
Expand Down
2 changes: 2 additions & 0 deletions include/SDL_loadso.h
Expand Up @@ -41,6 +41,8 @@
#ifndef _SDL_loadso_h
#define _SDL_loadso_h

#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down
7 changes: 4 additions & 3 deletions include/SDL_main.h
Expand Up @@ -23,6 +23,8 @@
#ifndef _SDL_main_h
#define _SDL_main_h

#include "SDL_stdinc.h"

/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */

#if defined(WIN32) || defined(_WIN32) || \
Expand Down Expand Up @@ -53,9 +55,8 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);

/* From the SDL library code -- needed for registering the app on Win32 */
#if defined(WIN32)
#include "SDL_types.h"
#include "begin_code.h"

#include "begin_code.h"
#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -74,8 +75,8 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp();

/* From the SDL library code -- needed for registering QuickDraw on MacOS */
#if defined(macintosh)
#include "begin_code.h"

#include "begin_code.h"
#ifdef __cplusplus
extern "C" {
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_mouse.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_mouse_h
#define _SDL_mouse_h

#include "SDL_types.h"
#include "SDL_stdinc.h"
#include "SDL_video.h"

#include "begin_code.h"
Expand Down
3 changes: 1 addition & 2 deletions include/SDL_mutex.h
Expand Up @@ -28,8 +28,7 @@
These are independent of the other SDL routines.
*/

#include "SDL_main.h"
#include "SDL_types.h"
#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
2 changes: 2 additions & 0 deletions include/SDL_quit.h
Expand Up @@ -25,6 +25,8 @@
#ifndef _SDL_quit_h
#define _SDL_quit_h

#include "SDL_stdinc.h"

/*
An SDL_QUITEVENT is generated when the user tries to close the application
window. If it is ignored or filtered out, the window will remain open.
Expand Down
2 changes: 0 additions & 2 deletions include/SDL_rwops.h
Expand Up @@ -29,7 +29,6 @@

#include "SDL_stdinc.h"

#ifndef DISABLE_FILE
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Expand Down Expand Up @@ -129,6 +128,5 @@ extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
}
#endif
#include "close_code.h"
#endif /* !DISABLE_FILE */

#endif /* _SDL_RWops_h */
1 change: 1 addition & 0 deletions include/SDL_syswm.h
Expand Up @@ -25,6 +25,7 @@
#ifndef _SDL_syswm_h
#define _SDL_syswm_h

#include "SDL_stdinc.h"
#include "SDL_version.h"

#include "begin_code.h"
Expand Down
3 changes: 1 addition & 2 deletions include/SDL_thread.h
Expand Up @@ -28,8 +28,7 @@
These are independent of the other SDL routines.
*/

#include "SDL_main.h"
#include "SDL_types.h"
#include "SDL_stdinc.h"

/* Thread synchronization primitives */
#include "SDL_mutex.h"
Expand Down
3 changes: 1 addition & 2 deletions include/SDL_timer.h
Expand Up @@ -25,8 +25,7 @@

/* Header for the SDL time management routines */

#include "SDL_main.h"
#include "SDL_types.h"
#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_version.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_version_h
#define _SDL_version_h

#include "SDL_types.h"
#include "SDL_stdinc.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_video.h
Expand Up @@ -25,7 +25,7 @@
#ifndef _SDL_video_h
#define _SDL_video_h

#include "SDL_types.h"
#include "SDL_stdinc.h"
#include "SDL_mutex.h"
#include "SDL_rwops.h"

Expand Down
3 changes: 1 addition & 2 deletions include/SDL_windows.h
Expand Up @@ -23,8 +23,7 @@
#ifndef _SDL_windows_h
#define _SDL_windows_h

#include "SDL_config.h"
#include "SDL_types.h"
#include "SDL_stdinc.h"

/* This includes only the windows headers needed by SDL, with no C runtime */
#define WIN32_LEAN_AND_MEAN
Expand Down

0 comments on commit 3d4edde

Please sign in to comment.