From fd03c21389537f66e3bda0d877a2ae067326e6fa Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 21 Feb 2006 08:46:50 +0000 Subject: [PATCH] Use consistent identifiers for the various platforms we support. Make sure every source file includes SDL_config.h, so the proper system headers are chosen. --- configure.in | 30 ++---- include/SDL_config.h | 2 + include/SDL_config.h.in | 14 ++- include/SDL_config.h.minimal | 2 + include/SDL_cpuinfo.h | 4 +- include/SDL_main.h | 8 +- include/SDL_opengl.h | 6 +- include/SDL_platform.h | 104 +++++++++++++++++++ include/SDL_rwops.h | 6 +- include/SDL_stdinc.h | 6 +- include/SDL_thread.h | 2 +- include/begin_code.h | 11 +- include/close_code.h | 2 +- src/SDL.c | 5 +- src/SDL_error.c | 1 + src/SDL_error_c.h | 1 + src/SDL_fatal.c | 3 +- src/SDL_fatal.h | 1 + src/audio/SDL_audio.c | 34 +++--- src/audio/SDL_audio_c.h | 1 + src/audio/SDL_audiocvt.c | 1 + src/audio/SDL_audiodev.c | 9 +- src/audio/SDL_audiodev_c.h | 1 + src/audio/SDL_audiomem.h | 1 + src/audio/SDL_mixer.c | 15 +-- src/audio/SDL_mixer_MMX.c | 25 ++++- src/audio/SDL_mixer_MMX.h | 1 + src/audio/SDL_mixer_MMX_VC.c | 26 ++++- src/audio/SDL_mixer_MMX_VC.h | 28 ++++- src/audio/SDL_mixer_m68k.c | 1 + src/audio/SDL_mixer_m68k.h | 1 + src/audio/SDL_sysaudio.h | 4 +- src/audio/SDL_wave.c | 1 + src/audio/SDL_wave.h | 1 + src/audio/alsa/SDL_alsa_audio.c | 3 +- src/audio/alsa/SDL_alsa_audio.h | 1 + src/audio/amigaos/SDL_ahiaudio.c | 1 + src/audio/amigaos/SDL_ahiaudio.h | 1 + src/audio/arts/SDL_artsaudio.c | 1 + src/audio/arts/SDL_artsaudio.h | 1 + src/audio/baudio/SDL_beaudio.h | 1 + src/audio/dart/SDL_dart.c | 1 + src/audio/dart/SDL_dart.h | 1 + src/audio/dc/SDL_dcaudio.c | 1 + src/audio/dc/SDL_dcaudio.h | 1 + src/audio/dc/aica.h | 23 ++++ src/audio/disk/SDL_diskaudio.c | 1 + src/audio/disk/SDL_diskaudio.h | 1 + src/audio/dma/SDL_dmaaudio.c | 3 +- src/audio/dma/SDL_dmaaudio.h | 1 + src/audio/dmedia/SDL_irixaudio.c | 1 + src/audio/dmedia/SDL_irixaudio.h | 1 + src/audio/dsp/SDL_dspaudio.c | 3 +- src/audio/dsp/SDL_dspaudio.h | 1 + src/audio/esd/SDL_esdaudio.c | 3 +- src/audio/esd/SDL_esdaudio.h | 1 + src/audio/macosx/SDL_coreaudio.c | 1 + src/audio/macosx/SDL_coreaudio.h | 1 + src/audio/macrom/SDL_romaudio.c | 7 +- src/audio/macrom/SDL_romaudio.h | 1 + src/audio/mint/SDL_mintaudio.c | 1 + src/audio/mint/SDL_mintaudio.h | 1 + src/audio/mint/SDL_mintaudio_dma8.c | 1 + src/audio/mint/SDL_mintaudio_dma8.h | 1 + src/audio/mint/SDL_mintaudio_gsxb.c | 1 + src/audio/mint/SDL_mintaudio_gsxb.h | 23 ++++ src/audio/mint/SDL_mintaudio_mcsn.c | 1 + src/audio/mint/SDL_mintaudio_mcsn.h | 1 + src/audio/mint/SDL_mintaudio_stfa.c | 1 + src/audio/mint/SDL_mintaudio_stfa.h | 1 + src/audio/mint/SDL_mintaudio_xbios.c | 1 + src/audio/mme/SDL_mmeaudio.c | 1 + src/audio/mme/SDL_mmeaudio.h | 1 + src/audio/nas/SDL_nasaudio.c | 1 + src/audio/nas/SDL_nasaudio.h | 1 + src/audio/nto/SDL_nto_audio.c | 1 + src/audio/nto/SDL_nto_audio.h | 1 + src/audio/openbsd/SDL_openbsdaudio.c | 1 + src/audio/openbsd/SDL_openbsdaudio.h | 1 + src/audio/paudio/SDL_paudio.c | 1 + src/audio/paudio/SDL_paudio.h | 1 + src/audio/sun/SDL_sunaudio.c | 3 +- src/audio/sun/SDL_sunaudio.h | 1 + src/audio/ums/SDL_umsaudio.c | 1 + src/audio/ums/SDL_umsaudio.h | 1 + src/audio/windib/SDL_dibaudio.c | 1 + src/audio/windib/SDL_dibaudio.h | 1 + src/audio/windx5/SDL_dx5audio.c | 1 + src/audio/windx5/SDL_dx5audio.h | 1 + src/cdrom/SDL_cdrom.c | 3 +- src/cdrom/SDL_syscdrom.h | 1 + src/cdrom/aix/SDL_syscdrom.c | 1 + src/cdrom/bsdi/SDL_syscdrom.c | 1 + src/cdrom/dc/SDL_syscdrom.c | 1 + src/cdrom/dummy/SDL_syscdrom.c | 1 + src/cdrom/freebsd/SDL_syscdrom.c | 1 + src/cdrom/linux/SDL_syscdrom.c | 3 +- src/cdrom/macos/SDL_syscdrom.c | 1 + src/cdrom/macos/SDL_syscdrom_c.h | 1 + src/cdrom/macosx/AudioFilePlayer.c | 1 + src/cdrom/macosx/AudioFilePlayer.h | 1 + src/cdrom/macosx/AudioFileReaderThread.c | 1 + src/cdrom/macosx/CDPlayer.c | 1 + src/cdrom/macosx/CDPlayer.h | 1 + src/cdrom/macosx/SDLOSXCAGuard.c | 2 + src/cdrom/macosx/SDLOSXCAGuard.h | 2 + src/cdrom/macosx/SDL_syscdrom.c | 1 + src/cdrom/macosx/SDL_syscdrom_c.h | 1 + src/cdrom/mint/SDL_syscdrom.c | 1 + src/cdrom/openbsd/SDL_syscdrom.c | 5 +- src/cdrom/os2/SDL_syscdrom.c | 1 + src/cdrom/osf/SDL_syscdrom.c | 2 +- src/cdrom/qnx/SDL_syscdrom.c | 1 + src/cdrom/win32/SDL_syscdrom.c | 1 + src/cpuinfo/SDL_cpuinfo.c | 5 +- src/events/SDL_active.c | 1 + src/events/SDL_events.c | 5 +- src/events/SDL_events_c.h | 1 + src/events/SDL_expose.c | 1 + src/events/SDL_keyboard.c | 1 + src/events/SDL_mouse.c | 1 + src/events/SDL_quit.c | 3 +- src/events/SDL_resize.c | 1 + src/events/SDL_sysevents.h | 5 +- src/file/SDL_rwops.c | 13 +-- src/hermes/HeadMMX.h | 1 + src/joystick/SDL_joystick.c | 1 + src/joystick/SDL_joystick_c.h | 1 + src/joystick/SDL_sysjoystick.h | 1 + src/joystick/amigaos/SDL_sysjoystick.c | 2 +- src/joystick/bsd/SDL_sysjoystick.c | 15 +-- src/joystick/darwin/SDL_sysjoystick.c | 1 + src/joystick/dc/SDL_sysjoystick.c | 1 + src/joystick/dummy/SDL_sysjoystick.c | 1 + src/joystick/linux/SDL_sysjoystick.c | 1 + src/joystick/macos/SDL_sysjoystick.c | 1 + src/joystick/mint/SDL_sysjoystick.c | 1 + src/joystick/os2/SDL_sysjoystick.c | 1 + src/joystick/riscos/SDL_sysjoystick.c | 1 + src/joystick/win32/SDL_mmjoystick.c | 1 + src/loadso/beos/SDL_sysloadso.c | 1 + src/loadso/dlopen/SDL_sysloadso.c | 1 + src/loadso/dummy/SDL_sysloadso.c | 1 + src/loadso/macos/SDL_sysloadso.c | 1 + src/loadso/macosx/SDL_sysloadso.c | 1 + src/loadso/mint/SDL_sysloadso.c | 1 + src/loadso/os2/SDL_sysloadso.c | 1 + src/loadso/win32/SDL_sysloadso.c | 3 +- src/main/beos/SDL_BeApp.h | 1 + src/stdlib/SDL_getenv.c | 5 +- src/stdlib/SDL_malloc.c | 2 +- src/stdlib/SDL_qsort.c | 1 + src/stdlib/SDL_stdlib.c | 2 +- src/stdlib/SDL_string.c | 2 +- src/thread/SDL_systhread.h | 3 +- src/thread/SDL_thread.c | 5 +- src/thread/SDL_thread_c.h | 1 + src/thread/amigaos/SDL_syssem.c | 1 + src/thread/amigaos/SDL_systhread.c | 1 + src/thread/amigaos/SDL_systhread_c.h | 1 + src/thread/amigaos/SDL_thread.c | 1 + src/thread/beos/SDL_syssem.c | 1 + src/thread/beos/SDL_systhread.c | 1 + src/thread/beos/SDL_systhread_c.h | 1 + src/thread/dc/SDL_syscond.c | 1 + src/thread/dc/SDL_syscond_c.h | 1 + src/thread/dc/SDL_sysmutex.c | 1 + src/thread/dc/SDL_sysmutex_c.h | 1 + src/thread/dc/SDL_syssem.c | 1 + src/thread/dc/SDL_syssem_c.h | 1 + src/thread/dc/SDL_systhread.c | 1 + src/thread/dc/SDL_systhread_c.h | 1 + src/thread/epoc/SDL_systhread_c.h | 1 + src/thread/generic/SDL_syscond.c | 1 + src/thread/generic/SDL_sysmutex.c | 1 + src/thread/generic/SDL_sysmutex_c.h | 1 + src/thread/generic/SDL_syssem.c | 1 + src/thread/generic/SDL_systhread.c | 1 + src/thread/generic/SDL_systhread_c.h | 1 + src/thread/irix/SDL_syssem.c | 5 +- src/thread/irix/SDL_systhread.c | 1 + src/thread/irix/SDL_systhread_c.h | 1 + src/thread/os2/SDL_syscond.c | 1 + src/thread/os2/SDL_syscond_c.h | 1 + src/thread/os2/SDL_sysmutex.c | 1 + src/thread/os2/SDL_syssem.c | 1 + src/thread/os2/SDL_systhread.c | 1 + src/thread/os2/SDL_systhread_c.h | 1 + src/thread/pth/SDL_syscond.c | 23 ++++ src/thread/pth/SDL_sysmutex.c | 23 ++++ src/thread/pth/SDL_sysmutex_c.h | 23 ++++ src/thread/pth/SDL_systhread.c | 1 + src/thread/pth/SDL_systhread_c.h | 1 + src/thread/pthread/SDL_syscond.c | 1 + src/thread/pthread/SDL_sysmutex.c | 1 + src/thread/pthread/SDL_sysmutex_c.h | 1 + src/thread/pthread/SDL_syssem.c | 5 +- src/thread/pthread/SDL_systhread.c | 3 +- src/thread/pthread/SDL_systhread_c.h | 1 + src/thread/riscos/SDL_syscond.c | 1 + src/thread/riscos/SDL_sysmutex.c | 1 + src/thread/riscos/SDL_sysmutex_c.h | 1 + src/thread/riscos/SDL_syssem.c | 1 + src/thread/riscos/SDL_systhread.c | 1 + src/thread/riscos/SDL_systhread_c.h | 1 + src/thread/win32/SDL_sysmutex.c | 1 + src/thread/win32/SDL_syssem.c | 1 + src/thread/win32/SDL_systhread.c | 1 + src/thread/win32/SDL_systhread_c.h | 1 + src/timer/SDL_systimer.h | 1 + src/timer/SDL_timer.c | 1 + src/timer/SDL_timer_c.h | 1 + src/timer/amigaos/SDL_systimer.c | 1 + src/timer/beos/SDL_systimer.c | 1 + src/timer/dc/SDL_systimer.c | 1 + src/timer/dummy/SDL_systimer.c | 1 + src/timer/macos/FastTimes.h | 3 +- src/timer/macos/SDL_MPWtimer.c | 1 + src/timer/macos/SDL_systimer.c | 1 + src/timer/mint/SDL_systimer.c | 1 + src/timer/mint/SDL_vbltimer_s.h | 1 + src/timer/os2/SDL_systimer.c | 1 + src/timer/riscos/SDL_systimer.c | 1 + src/timer/unix/SDL_systimer.c | 1 + src/timer/win32/SDL_systimer.c | 1 + src/timer/wince/SDL_systimer.c | 1 + src/video/SDL_RLEaccel.c | 3 +- src/video/SDL_RLEaccel_c.h | 1 + src/video/SDL_blit.c | 3 +- src/video/SDL_blit.h | 1 + src/video/SDL_blit_0.c | 1 + src/video/SDL_blit_1.c | 1 + src/video/SDL_blit_A.c | 5 +- src/video/SDL_blit_N.c | 7 +- src/video/SDL_bmp.c | 1 + src/video/SDL_cursor.c | 1 + src/video/SDL_cursor_c.h | 1 + src/video/SDL_gamma.c | 3 +- src/video/SDL_leaks.h | 1 + src/video/SDL_pixels.c | 1 + src/video/SDL_pixels_c.h | 1 + src/video/SDL_stretch.c | 3 +- src/video/SDL_stretch_c.h | 1 + src/video/SDL_surface.c | 1 + src/video/SDL_sysvideo.h | 12 +-- src/video/SDL_video.c | 3 +- src/video/SDL_yuv.c | 1 + src/video/SDL_yuv_mmx.c | 5 +- src/video/SDL_yuv_sw.c | 5 +- src/video/SDL_yuv_sw_c.h | 1 + src/video/SDL_yuvfuncs.h | 1 + src/video/aalib/SDL_aaevents.c | 1 + src/video/aalib/SDL_aaevents_c.h | 1 + src/video/aalib/SDL_aamouse.c | 1 + src/video/aalib/SDL_aamouse_c.h | 1 + src/video/aalib/SDL_aavideo.c | 1 + src/video/aalib/SDL_aavideo.h | 1 + src/video/ataricommon/SDL_ataric2p_s.h | 1 + src/video/ataricommon/SDL_atarieddi_s.h | 1 + src/video/ataricommon/SDL_atarievents.c | 1 + src/video/ataricommon/SDL_atarievents_c.h | 1 + src/video/ataricommon/SDL_atarigl.c | 1 + src/video/ataricommon/SDL_atarigl_c.h | 1 + src/video/ataricommon/SDL_atarimxalloc.c | 1 + src/video/ataricommon/SDL_atarimxalloc_c.h | 1 + src/video/ataricommon/SDL_biosevents.c | 1 + src/video/ataricommon/SDL_biosevents_c.h | 1 + src/video/ataricommon/SDL_gemdosevents.c | 1 + src/video/ataricommon/SDL_gemdosevents_c.h | 1 + src/video/ataricommon/SDL_ikbdevents.c | 1 + src/video/ataricommon/SDL_ikbdevents_c.h | 1 + src/video/ataricommon/SDL_ikbdinterrupt_s.h | 1 + src/video/ataricommon/SDL_xbiosevents.c | 1 + src/video/ataricommon/SDL_xbiosevents_c.h | 1 + src/video/ataricommon/SDL_xbiosinterrupt_s.h | 1 + src/video/bwindow/SDL_BView.h | 1 + src/video/bwindow/SDL_lowvideo.h | 1 + src/video/bwindow/SDL_sysevents_c.h | 1 + src/video/bwindow/SDL_sysmouse_c.h | 1 + src/video/bwindow/SDL_syswm_c.h | 1 + src/video/bwindow/SDL_sysyuv.h | 1 + src/video/cybergfx/SDL_amigaevents.c | 1 + src/video/cybergfx/SDL_amigaevents_c.h | 1 + src/video/cybergfx/SDL_amigamouse.c | 1 + src/video/cybergfx/SDL_amigamouse_c.h | 1 + src/video/cybergfx/SDL_cgxaccel.c | 1 + src/video/cybergfx/SDL_cgxgl.c | 1 + src/video/cybergfx/SDL_cgxgl_c.h | 1 + src/video/cybergfx/SDL_cgximage.c | 1 + src/video/cybergfx/SDL_cgximage_c.h | 1 + src/video/cybergfx/SDL_cgxmodes.c | 1 + src/video/cybergfx/SDL_cgxmodes_c.h | 1 + src/video/cybergfx/SDL_cgxvideo.c | 1 + src/video/cybergfx/SDL_cgxvideo.h | 1 + src/video/cybergfx/SDL_cgxwm.c | 1 + src/video/cybergfx/SDL_cgxwm_c.h | 1 + src/video/dc/SDL_dcevents.c | 1 + src/video/dc/SDL_dcevents_c.h | 1 + src/video/dc/SDL_dcmouse.c | 1 + src/video/dc/SDL_dcmouse_c.h | 1 + src/video/dc/SDL_dcvideo.c | 1 + src/video/dc/SDL_dcvideo.h | 1 + src/video/dga/SDL_dgaevents.c | 1 + src/video/dga/SDL_dgaevents_c.h | 1 + src/video/dga/SDL_dgamouse.c | 1 + src/video/dga/SDL_dgamouse_c.h | 1 + src/video/dga/SDL_dgavideo.c | 1 + src/video/dga/SDL_dgavideo.h | 1 + src/video/directfb/SDL_DirectFB_events.c | 1 + src/video/directfb/SDL_DirectFB_events.h | 1 + src/video/directfb/SDL_DirectFB_video.c | 1 + src/video/directfb/SDL_DirectFB_video.h | 1 + src/video/directfb/SDL_DirectFB_yuv.c | 1 + src/video/directfb/SDL_DirectFB_yuv.h | 1 + src/video/dummy/SDL_nullevents.c | 1 + src/video/dummy/SDL_nullevents_c.h | 1 + src/video/dummy/SDL_nullmouse.c | 1 + src/video/dummy/SDL_nullmouse_c.h | 1 + src/video/dummy/SDL_nullvideo.c | 1 + src/video/dummy/SDL_nullvideo.h | 1 + src/video/epoc/SDL_epocevents_c.h | 1 + src/video/epoc/SDL_epocvideo.h | 1 + src/video/fbcon/3dfx_mmio.h | 1 + src/video/fbcon/3dfx_regs.h | 1 + src/video/fbcon/SDL_fb3dfx.c | 1 + src/video/fbcon/SDL_fb3dfx.h | 1 + src/video/fbcon/SDL_fbelo.c | 1 + src/video/fbcon/SDL_fbelo.h | 1 + src/video/fbcon/SDL_fbevents.c | 1 + src/video/fbcon/SDL_fbevents_c.h | 1 + src/video/fbcon/SDL_fbmatrox.c | 1 + src/video/fbcon/SDL_fbmatrox.h | 1 + src/video/fbcon/SDL_fbmouse.c | 1 + src/video/fbcon/SDL_fbmouse_c.h | 1 + src/video/fbcon/SDL_fbriva.c | 1 + src/video/fbcon/SDL_fbriva.h | 1 + src/video/fbcon/SDL_fbvideo.c | 1 + src/video/fbcon/SDL_fbvideo.h | 1 + src/video/fbcon/matrox_mmio.h | 1 + src/video/fbcon/riva_regs.h | 1 + src/video/gapi/SDL_gapivideo.c | 1 + src/video/gapi/SDL_gapivideo.h | 1 + src/video/gem/SDL_gemevents.c | 1 + src/video/gem/SDL_gemevents_c.h | 1 + src/video/gem/SDL_gemmouse.c | 1 + src/video/gem/SDL_gemmouse_c.h | 1 + src/video/gem/SDL_gemvideo.c | 1 + src/video/gem/SDL_gemvideo.h | 1 + src/video/gem/SDL_gemwm.c | 1 + src/video/gem/SDL_gemwm_c.h | 1 + src/video/ggi/SDL_ggievents.c | 1 + src/video/ggi/SDL_ggievents_c.h | 1 + src/video/ggi/SDL_ggimouse.c | 1 + src/video/ggi/SDL_ggimouse_c.h | 1 + src/video/ggi/SDL_ggivideo.c | 1 + src/video/ggi/SDL_ggivideo.h | 1 + src/video/ipod/SDL_ipodvideo.c | 23 ++++ src/video/ipod/SDL_ipodvideo.h | 1 + src/video/maccommon/SDL_lowvideo.h | 11 +- src/video/maccommon/SDL_macevents.c | 1 + src/video/maccommon/SDL_macevents_c.h | 1 + src/video/maccommon/SDL_macgl.c | 1 + src/video/maccommon/SDL_macgl_c.h | 12 +-- src/video/maccommon/SDL_macmouse.c | 1 + src/video/maccommon/SDL_macmouse_c.h | 1 + src/video/maccommon/SDL_macwm.c | 1 + src/video/maccommon/SDL_macwm_c.h | 1 + src/video/macdsp/SDL_dspvideo.c | 1 + src/video/macdsp/SDL_dspvideo.h | 1 + src/video/macrom/SDL_romvideo.c | 3 +- src/video/macrom/SDL_romvideo.h | 1 + src/video/nanox/SDL_nxevents.c | 1 + src/video/nanox/SDL_nxevents_c.h | 1 + src/video/nanox/SDL_nximage.c | 1 + src/video/nanox/SDL_nximage_c.h | 1 + src/video/nanox/SDL_nxmodes.c | 1 + src/video/nanox/SDL_nxmodes_c.h | 1 + src/video/nanox/SDL_nxmouse.c | 1 + src/video/nanox/SDL_nxmouse_c.h | 23 ++++ src/video/nanox/SDL_nxvideo.c | 1 + src/video/nanox/SDL_nxvideo.h | 1 + src/video/nanox/SDL_nxwm.c | 1 + src/video/nanox/SDL_nxwm_c.h | 1 + src/video/os2fslib/SDL_os2fslib.c | 1 + src/video/os2fslib/SDL_os2fslib.h | 1 + src/video/photon/SDL_ph_events.c | 1 + src/video/photon/SDL_ph_events_c.h | 1 + src/video/photon/SDL_ph_gl.c | 1 + src/video/photon/SDL_ph_gl.h | 1 + src/video/photon/SDL_ph_image.c | 1 + src/video/photon/SDL_ph_image_c.h | 1 + src/video/photon/SDL_ph_modes.c | 1 + src/video/photon/SDL_ph_modes_c.h | 1 + src/video/photon/SDL_ph_mouse.c | 1 + src/video/photon/SDL_ph_mouse_c.h | 1 + src/video/photon/SDL_ph_video.c | 1 + src/video/photon/SDL_ph_video.h | 1 + src/video/photon/SDL_ph_wm.c | 1 + src/video/photon/SDL_ph_wm_c.h | 1 + src/video/photon/SDL_phyuv.c | 1 + src/video/photon/SDL_phyuv_c.h | 2 +- src/video/picogui/SDL_pgevents.c | 1 + src/video/picogui/SDL_pgevents_c.h | 1 + src/video/picogui/SDL_pgvideo.c | 1 + src/video/picogui/SDL_pgvideo.h | 1 + src/video/ps2gs/SDL_gsevents.c | 1 + src/video/ps2gs/SDL_gsevents_c.h | 1 + src/video/ps2gs/SDL_gsmouse.c | 1 + src/video/ps2gs/SDL_gsmouse_c.h | 1 + src/video/ps2gs/SDL_gsvideo.c | 1 + src/video/ps2gs/SDL_gsvideo.h | 1 + src/video/ps2gs/SDL_gsyuv.c | 1 + src/video/ps2gs/SDL_gsyuv_c.h | 1 + src/video/qtopia/SDL_QPEApp.h | 1 + src/video/qtopia/SDL_QWin.h | 1 + src/video/qtopia/SDL_lowvideo.h | 1 + src/video/qtopia/SDL_sysevents_c.h | 1 + src/video/qtopia/SDL_sysmouse_c.h | 1 + src/video/qtopia/SDL_syswm_c.h | 1 + src/video/quartz/CGS.h | 1 + src/video/quartz/SDL_QuartzKeys.h | 1 + src/video/quartz/SDL_QuartzVideo.h | 1 + src/video/quartz/SDL_QuartzWindow.h | 1 + src/video/riscos/SDL_riscosFullScreenVideo.c | 1 + src/video/riscos/SDL_riscosevents.c | 1 + src/video/riscos/SDL_riscosevents_c.h | 1 + src/video/riscos/SDL_riscosmouse.c | 1 + src/video/riscos/SDL_riscosmouse_c.h | 1 + src/video/riscos/SDL_riscossprite.c | 1 + src/video/riscos/SDL_riscostask.c | 1 + src/video/riscos/SDL_riscostask.h | 1 + src/video/riscos/SDL_riscosvideo.c | 1 + src/video/riscos/SDL_riscosvideo.h | 1 + src/video/riscos/SDL_wimppoll.c | 1 + src/video/riscos/SDL_wimpvideo.c | 1 + src/video/svga/SDL_svgaevents.c | 11 +- src/video/svga/SDL_svgaevents_c.h | 1 + src/video/svga/SDL_svgamouse.c | 1 + src/video/svga/SDL_svgamouse_c.h | 1 + src/video/svga/SDL_svgavideo.c | 5 +- src/video/svga/SDL_svgavideo.h | 1 + src/video/vgl/SDL_vglevents.c | 1 + src/video/vgl/SDL_vglevents_c.h | 1 + src/video/vgl/SDL_vglmouse.c | 1 + src/video/vgl/SDL_vglmouse_c.h | 1 + src/video/vgl/SDL_vglvideo.c | 3 +- src/video/vgl/SDL_vglvideo.h | 1 + src/video/wincommon/SDL_lowvideo.h | 1 + src/video/wincommon/SDL_sysevents.c | 1 + src/video/wincommon/SDL_sysmouse.c | 1 + src/video/wincommon/SDL_sysmouse_c.h | 1 + src/video/wincommon/SDL_syswm.c | 1 + src/video/wincommon/SDL_syswm_c.h | 1 + src/video/wincommon/SDL_wingl.c | 1 + src/video/wincommon/SDL_wingl_c.h | 1 + src/video/windib/SDL_dibevents.c | 1 + src/video/windib/SDL_dibevents_c.h | 1 + src/video/windib/SDL_dibvideo.c | 1 + src/video/windib/SDL_dibvideo.h | 1 + src/video/windx5/SDL_dx5events.c | 1 + src/video/windx5/SDL_dx5events_c.h | 1 + src/video/windx5/SDL_dx5video.c | 1 + src/video/windx5/SDL_dx5video.h | 1 + src/video/windx5/SDL_dx5yuv.c | 1 + src/video/windx5/SDL_dx5yuv_c.h | 1 + src/video/wscons/SDL_wsconsevents.c | 1 + src/video/wscons/SDL_wsconsevents_c.h | 1 + src/video/wscons/SDL_wsconsmouse.c | 1 + src/video/wscons/SDL_wsconsmouse_c.h | 1 + src/video/wscons/SDL_wsconsvideo.c | 1 + src/video/wscons/SDL_wsconsvideo.h | 1 + src/video/x11/SDL_x11dga.c | 1 + src/video/x11/SDL_x11dga_c.h | 1 + src/video/x11/SDL_x11dyn.c | 3 +- src/video/x11/SDL_x11dyn.h | 1 + src/video/x11/SDL_x11events.c | 1 + src/video/x11/SDL_x11events_c.h | 1 + src/video/x11/SDL_x11gamma.c | 1 + src/video/x11/SDL_x11gamma_c.h | 1 + src/video/x11/SDL_x11gl.c | 7 +- src/video/x11/SDL_x11gl_c.h | 1 + src/video/x11/SDL_x11image.c | 5 +- src/video/x11/SDL_x11image_c.h | 1 + src/video/x11/SDL_x11modes.c | 1 + src/video/x11/SDL_x11modes_c.h | 1 + src/video/x11/SDL_x11mouse.c | 1 + src/video/x11/SDL_x11mouse_c.h | 1 + src/video/x11/SDL_x11video.c | 11 +- src/video/x11/SDL_x11video.h | 1 + src/video/x11/SDL_x11wm.c | 1 + src/video/x11/SDL_x11wm_c.h | 1 + src/video/x11/SDL_x11yuv.c | 3 +- src/video/x11/SDL_x11yuv_c.h | 1 + src/video/xbios/SDL_xbios.c | 1 + src/video/xbios/SDL_xbios.h | 1 + src/video/xbios/SDL_xbios_blowup.c | 1 + src/video/xbios/SDL_xbios_blowup.h | 1 + src/video/xbios/SDL_xbios_centscreen.c | 1 + src/video/xbios/SDL_xbios_centscreen.h | 1 + src/video/xbios/SDL_xbios_sb3.c | 1 + src/video/xbios/SDL_xbios_sb3.h | 1 + test/testdyngl.c | 16 +-- 502 files changed, 974 insertions(+), 219 deletions(-) create mode 100644 include/SDL_platform.h diff --git a/configure.in b/configure.in index 83b92950a..fc399886f 100644 --- a/configure.in +++ b/configure.in @@ -57,10 +57,10 @@ fi case "$target" in *-*-cygwin*) # We build SDL on cygwin without the UNIX emulation layer - CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin" + CFLAGS="$CFLAGS -I/usr/include/mingw -mno-cygwin" BUILD_CFLAGS="$CFLAGS \$(INCLUDE)" BUILD_LDFLAGS="$LDFLAGS -mno-cygwin" - SDL_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin" + SDL_CFLAGS="-I/usr/include/mingw -mno-cygwin" SDL_LIBS="-lSDL -mno-cygwin" ;; *) @@ -239,11 +239,11 @@ AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [default=yes]]) if test x$enable_cpuinfo != xyes; then AC_DEFINE(SDL_CPUINFO_DISABLED) fi -AC_ARG_ENABLE(assembly-blit, -AC_HELP_STRING([--enable-asm-blit], [Enable assembly blitters [default=yes]]), - , enable_asm_blit=yes) -if test x$enable_asm_blit = xyes; then - AC_DEFINE(SDL_ASSEMBLY_BLITTERS) +AC_ARG_ENABLE(assembly, +AC_HELP_STRING([--enable-assembly], [Enable assembly routines [default=yes]]), + , enable_assembly=yes) +if test x$enable_assembly = xyes; then + AC_DEFINE(SDL_ASSEMBLY_ROUTINES) fi dnl See if the OSS audio interface is supported @@ -559,7 +559,7 @@ CheckNASM() AC_ARG_ENABLE(nasm, AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [default=yes]]), , enable_nasm=yes) - if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_nasm = xyes; then + if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then AC_PATH_PROG(NASM, nasm) if test x$NASM != x -a x$NASM != x'"$NASM"'; then AC_DEFINE(SDL_HERMES_BLITTERS) @@ -595,7 +595,7 @@ CheckAltivec() AC_ARG_ENABLE(altivec, AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [default=yes]]), , enable_altivec=yes) - if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_altivec = xyes; then + if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then have_altivec_h_hdr=no AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes) @@ -2012,13 +2012,6 @@ case "$target" in SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" have_timers=yes fi - # Do any final platform setup - case $ARCH in - openbsd|netbsd) - # OpenBSD and NetBSD do not define "unix" - BUILD_CFLAGS="$BUILD_CFLAGS -Dunix" - ;; - esac ;; *-*-qnx*) ARCH=qnx @@ -2221,8 +2214,7 @@ case "$target" in fi # The MacOS X platform requires special setup. SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m" - AC_DEFINE(TARGET_API_MAC_CARBON) - BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings -DMACOSX" + BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings" SDL_LIBS="-lSDLmain $SDL_LIBS" if test x$enable_video_cocoa = xyes; then BUILD_LDFLAGS="$BUILD_LDFLAGS -framework Cocoa" @@ -2279,8 +2271,6 @@ case "$target" in fi have_timers=yes fi - # MiNT does not define "unix" - BUILD_CFLAGS="$BUILD_CFLAGS -Dunix" ;; *-riscos) ARCH=riscos diff --git a/include/SDL_config.h b/include/SDL_config.h index 67aaa63cc..f54240045 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -25,6 +25,8 @@ /* This is the minimal configuration that can be used to build SDL */ +#include "SDL_platform.h" + #include typedef signed char int8_t; diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index d2cdedcf5..c15c2b8c1 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -25,6 +25,9 @@ /* This is a set of defines to configure the SDL features */ +/* General platform specific identifiers */ +#include "SDL_platform.h" + /* C language features */ #undef const #undef inline @@ -48,7 +51,7 @@ /* Comment this if you want to build without any C library requirements */ #undef HAVE_LIBC -#ifdef HAVE_LIBC +#if HAVE_LIBC /* Useful headers */ #undef HAVE_ALLOCA_H @@ -127,10 +130,6 @@ #include #endif /* HAVE_LIBC */ -/* General platform specific identifiers */ -#undef TARGET_API_MAC_CARBON -#undef TARGET_API_MAC_OSX - /* Allow disabling of core subsystems */ #undef SDL_AUDIO_DISABLED #undef SDL_CDROM_DISABLED @@ -155,7 +154,6 @@ #undef SDL_AUDIO_DRIVER_DC #undef SDL_AUDIO_DRIVER_DISK #undef SDL_AUDIO_DRIVER_DMEDIA -#undef SDL_AUDIO_DRIVER_DRENDERER #undef SDL_AUDIO_DRIVER_DSOUND #undef SDL_AUDIO_DRIVER_ESD #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC @@ -285,8 +283,8 @@ #undef SDL_VIDEO_OPENGL_OSMESA #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC -/* Enable assembly blit routines */ -#undef SDL_ASSEMBLY_BLITTERS +/* Enable assembly routines */ +#undef SDL_ASSEMBLY_ROUTINES #undef SDL_HERMES_BLITTERS #undef SDL_ALTIVEC_BLITTERS diff --git a/include/SDL_config.h.minimal b/include/SDL_config.h.minimal index 67aaa63cc..f54240045 100644 --- a/include/SDL_config.h.minimal +++ b/include/SDL_config.h.minimal @@ -25,6 +25,8 @@ /* This is the minimal configuration that can be used to build SDL */ +#include "SDL_platform.h" + #include typedef signed char int8_t; diff --git a/include/SDL_cpuinfo.h b/include/SDL_cpuinfo.h index 47e64c03e..dd1fb5242 100644 --- a/include/SDL_cpuinfo.h +++ b/include/SDL_cpuinfo.h @@ -23,11 +23,11 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* CPU feature detection for SDL */ -#include "SDL_stdinc.h" - #ifndef _SDL_cpuinfo_h #define _SDL_cpuinfo_h +#include "SDL_stdinc.h" + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus diff --git a/include/SDL_main.h b/include/SDL_main.h index b6a16ef7b..2dd62b524 100644 --- a/include/SDL_main.h +++ b/include/SDL_main.h @@ -27,9 +27,9 @@ /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ -#if defined(WIN32) || defined(_WIN32) || \ +#if defined(__WIN32__) || \ (defined(__MWERKS__) && !defined(__BEOS__)) || \ - defined(macintosh) || defined(__APPLE__) || \ + defined(__MACOS__) || defined(__MACOSX__) || \ defined(__SYMBIAN32__) || defined(QWS) #ifdef __cplusplus @@ -54,7 +54,7 @@ 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) +#ifdef __WIN32__ #include "begin_code.h" #ifdef __cplusplus @@ -74,7 +74,7 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(); #endif /* From the SDL library code -- needed for registering QuickDraw on MacOS */ -#if defined(macintosh) +#if defined(__MACOS__) #include "begin_code.h" #ifdef __cplusplus diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index bc8977db8..6360fd2f2 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -22,7 +22,9 @@ /* This is a simple file to encapsulate the OpenGL API headers */ -#ifdef WIN32 +#include "SDL_config.h" + +#ifdef __WIN32__ #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX #define NOMINMAX /* Don't defined min() and max() */ @@ -32,7 +34,7 @@ #ifndef NO_SDL_GLEXT #define __glext_h_ /* Don't let gl.h include glext.h */ #endif -#if defined(__APPLE__) && defined(__MACH__) +#ifdef __MACOSX__ #include /* Header File For The OpenGL Library */ #include /* Header File For The GLU Library */ #else diff --git a/include/SDL_platform.h b/include/SDL_platform.h new file mode 100644 index 000000000..b3a8962ff --- /dev/null +++ b/include/SDL_platform.h @@ -0,0 +1,104 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ + +/* Try to get a standard set of platform defines */ + +#if defined(_AIX) +#undef __AIX__ +#define __AIX__ 1 +#endif +#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__) +/* FIXME: is this the right test for AmigaOS? */ +#undef __AMIGA__ +#define __AMIGA__ 1 +#endif +#if defined(__BEOS__) +#undef __BEOS__ +#define __BEOS__ 1 +#endif +#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__) +#undef __BSDI__ +#define __BSDI__ 1 +#endif +#if defined(DREAMCAST) +/* FIXME: is this the right test for Dreamcast? */ +#undef __DREAMCAST__ +#define __DREAMCAST__ 1 +#endif +#if defined(__FreeBSD__) +#undef __FREEBSD__ +#define __FREEBSD__ 1 +#endif +#if defined(hpux) || defined(__hpux) || defined(__hpux__) +#undef __HPUX__ +#define __HPUX__ 1 +#endif +#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE) +#undef __IRIX__ +#define __IRIX__ 1 +#endif +#if defined(linux) || defined(__linux) || defined(__linux__) +#undef __LINUX__ +#define __LINUX__ 1 +#endif +#if defined(macintosh) +#undef __MACOS__ +#define __MACOS__ 1 +#endif +#if defined(__GNUC__) && (defined(__APPLE_CC__) || defined(__APPLE_CPP__)) +#undef __MACOSX__ +#define __MACOSX__ 1 +#define TARGET_API_MAC_CARBON 1 +#endif +#if defined(__NetBSD__) +#undef __NETBSD__ +#define __NETBSD__ 1 +#endif +#if defined(__OpenBSD__) +#undef __OPENBSD__ +#define __OPENBSD__ 1 +#endif +#if defined(__OS2__) +#undef __OS2__ +#define __OS2__ 1 +#endif +#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE) +#undef __OSF__ +#define __OSF__ 1 +#endif +#if defined(__QNXNTO__) +#undef __QNXNTO__ +#define __QNXNTO__ 1 +#endif +#if defined(riscos) || defined(__riscos) || defined(__riscos__) +#undef __RISCOS__ +#define __RISCOS__ 1 +#endif +#if defined(solaris) || defined(__solaris) || defined(__solaris__) +/* FIXME: is this the right test for Solaris? Check SDL_sunaudio.c */ +#undef __SOLARIS__ +#define __SOLARIS__ 1 +#endif +#if defined(WIN32) || defined(_WIN32) +#undef __WIN32__ +#define __WIN32__ 1 +#endif diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index f5d96d283..0592f472f 100644 --- a/include/SDL_rwops.h +++ b/include/SDL_rwops.h @@ -24,8 +24,8 @@ data sources. It can easily be extended to files, memory, etc. */ -#ifndef _SDL_RWops_h -#define _SDL_RWops_h +#ifndef _SDL_rwops_h +#define _SDL_rwops_h #include "SDL_stdinc.h" #include "SDL_error.h" @@ -130,4 +130,4 @@ extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value); #endif #include "close_code.h" -#endif /* _SDL_RWops_h */ +#endif /* _SDL_rwops_h */ diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index a2a4ba3e3..2a90eef71 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -159,12 +159,12 @@ extern DECLSPEC void SDLCALL SDL_free(void *mem); #if HAVE_ALLOCA && !defined(alloca) # if HAVE_ALLOCA_H # include -# elif __GNUC__ +# elif defined(__GNUC__) # define alloca __builtin_alloca -# elif _MSC_VER +# elif defined(_MSC_VER) # include # define alloca _alloca -# elif _AIX +# elif defined(__AIX__) #pragma alloca # else char *alloca (); diff --git a/include/SDL_thread.h b/include/SDL_thread.h index 24a95fb32..51e517731 100644 --- a/include/SDL_thread.h +++ b/include/SDL_thread.h @@ -45,7 +45,7 @@ struct SDL_Thread; typedef struct SDL_Thread SDL_Thread; /* Create a thread */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(__WIN32__) || defined(__OS2__) /* We compile SDL into a DLL on OS/2. This means, that it's the DLL which creates a new thread for the calling process with the SDL_CreateThread() diff --git a/include/begin_code.h b/include/begin_code.h index 78f22209a..62c75ce47 100644 --- a/include/begin_code.h +++ b/include/begin_code.h @@ -31,11 +31,6 @@ #endif #define _begin_code_h -/* Make sure the correct platform symbols are defined */ -#if !defined(WIN32) && defined(_WIN32) -#define WIN32 -#endif /* Windows */ - /* Some compilers use a special export keyword */ #ifndef DECLSPEC # ifdef __BEOS__ @@ -45,7 +40,7 @@ # define DECLSPEC __declspec(export) # endif # else -# ifdef WIN32 +# ifdef __WIN32__ # ifdef __BORLANDC__ # ifdef BUILD_SDL # define DECLSPEC @@ -75,7 +70,7 @@ /* By default SDL uses the C calling convention */ #ifndef SDLCALL -#if defined(WIN32) && !defined(__GNUC__) +#if defined(__WIN32__) && !defined(__GNUC__) #define SDLCALL __cdecl #else #ifdef __OS2__ @@ -107,7 +102,7 @@ #pragma nopackwarning #endif #pragma pack(push,4) -#elif (defined(__MWERKS__) && defined(macintosh)) +#elif (defined(__MWERKS__) && defined(__MACOS__)) #pragma options align=mac68k4byte #pragma enumsalwaysint on #endif /* Compiler needs structure packing set */ diff --git a/include/close_code.h b/include/close_code.h index ca6da95dd..afbb65047 100644 --- a/include/close_code.h +++ b/include/close_code.h @@ -31,7 +31,7 @@ #ifdef __BORLANDC__ #pragma nopackwarning #endif -#if (defined(__MWERKS__) && defined(macintosh)) +#if (defined(__MWERKS__) && defined(__MACOS__)) #pragma options align=reset #pragma enumsalwaysint reset #else diff --git a/src/SDL.c b/src/SDL.c index 971973681..0c2f6bebf 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Initialization code for SDL */ @@ -322,7 +323,7 @@ unsigned _System LibMain(unsigned hmod, unsigned termination) } #endif /* __WATCOMC__ */ -#elif defined(_WIN32) +#elif defined(__WIN32__) #if !defined(HAVE_LIBC) || defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL)) /* Need to include DllMain() on Windows CE and Watcom C for some reason.. */ @@ -343,4 +344,4 @@ BOOL APIENTRY _DllMainCRTStartup( HANDLE hModule, } #endif /* _WIN32_WCE and building DLL with Watcom C */ -#endif /* OS/2 elif _WIN32 */ +#endif /* OS/2 elif __WIN32__ */ diff --git a/src/SDL_error.c b/src/SDL_error.c index 4a77c42c5..d4a28f665 100644 --- a/src/SDL_error.c +++ b/src/SDL_error.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Simple error handling in SDL */ diff --git a/src/SDL_error_c.h b/src/SDL_error_c.h index 9aee54c62..05987eca7 100644 --- a/src/SDL_error_c.h +++ b/src/SDL_error_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This file defines a structure that carries language-independent error messages diff --git a/src/SDL_fatal.c b/src/SDL_fatal.c index e904bb75f..784836b9f 100644 --- a/src/SDL_fatal.c +++ b/src/SDL_fatal.c @@ -19,11 +19,10 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General fatal signal handling code for SDL */ -#include "SDL_config.h" - #ifdef HAVE_SIGNAL_H #include diff --git a/src/SDL_fatal.h b/src/SDL_fatal.h index 0c60cb308..34b60690c 100644 --- a/src/SDL_fatal.h +++ b/src/SDL_fatal.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General fatal signal handling code for SDL */ diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index 9758bc346..c7ccc8bd8 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ @@ -97,9 +98,6 @@ static AudioBootStrap *bootstrap[] = { #if SDL_AUDIO_DRIVER_DC &DCAUD_bootstrap, #endif -#if SDL_AUDIO_DRIVER_DRENDERER - &DRENDERER_bootstrap, -#endif #if SDL_AUDIO_DRIVER_MMEAUDIO &MMEAUDIO_bootstrap, #endif @@ -114,7 +112,7 @@ SDL_AudioDevice *current_audio = NULL; int SDL_AudioInit(const char *driver_name); void SDL_AudioQuit(void); -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI static int audio_configured = 0; #endif @@ -127,7 +125,7 @@ int SDL_RunAudio(void *audiop) void *udata; void (*fill)(void *userdata,Uint8 *stream, int len); int silence; -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI int started = 0; /* AmigaOS NEEDS that the audio driver is opened in the thread that uses it! */ @@ -153,7 +151,7 @@ int SDL_RunAudio(void *audiop) fill = audio->spec.callback; udata = audio->spec.userdata; -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI audio_configured = 1; D(bug("Audio configured... Checking for conversion\n")); @@ -174,7 +172,7 @@ int SDL_RunAudio(void *audiop) } stream = audio->fake_stream; -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI SDL_mutexV(audio->mixer_lock); D(bug("Entering audio loop...\n")); #endif @@ -197,7 +195,7 @@ int SDL_RunAudio(void *audiop) if ( stream == audio->fake_stream ) { SDL_Delay((audio->spec.samples*1000)/audio->spec.freq); } else { -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI if ( started > 1 ) #endif audio->WaitAudio(audio); @@ -238,7 +236,7 @@ int SDL_RunAudio(void *audiop) /* Ready current buffer for play and change current buffer */ if ( stream != audio->fake_stream ) { audio->PlayAudio(audio); -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI /* AmigaOS don't have to wait the first time audio is played! */ started++; #endif @@ -249,7 +247,7 @@ int SDL_RunAudio(void *audiop) audio->WaitDone(audio); } -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI D(bug("WaitAudio...Done\n")); audio->CloseAudio(audio); @@ -413,7 +411,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) return(-1); } -#if defined(macintosh) || (defined(__riscos__) && SDL_THREADS_DISABLED) +#if defined(__MACOS__) || (defined(__RISCOS__) && SDL_THREADS_DISABLED) /* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */ #else #if defined(__MINT__) && SDL_THREADS_DISABLED @@ -427,7 +425,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) return(-1); } #endif /* __MINT__ */ -#endif /* macintosh */ +#endif /* __MACOS__ */ /* Calculate the silence and size of the audio specification */ SDL_CalculateAudioSpec(desired); @@ -438,7 +436,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) audio->enabled = 1; audio->paused = 1; -#ifndef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI /* AmigaOS opens audio inside the main loop */ audio->opened = audio->OpenAudio(audio, &audio->spec)+1; @@ -450,8 +448,9 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) #else D(bug("Locking semaphore...")); SDL_mutexP(audio->mixer_lock); +#endif -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL); #else @@ -466,6 +465,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) return(-1); } +#if SDL_AUDIO_DRIVER_AHI while(!audio_configured) SDL_Delay(100); #endif @@ -511,12 +511,12 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) } } -#ifndef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI /* Start the audio thread if necessary */ switch (audio->opened) { case 1: /* Start the audio thread */ -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL); #else @@ -611,7 +611,7 @@ void SDL_AudioQuit(void) SDL_FreeAudioMem(audio->convert.buf); } -#ifndef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI if ( audio->opened ) { audio->CloseAudio(audio); audio->opened = 0; diff --git a/src/audio/SDL_audio_c.h b/src/audio/SDL_audio_c.h index 2b2baab98..98debed10 100644 --- a/src/audio/SDL_audio_c.h +++ b/src/audio/SDL_audio_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */ diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c index 8141e6217..9ef0bb067 100644 --- a/src/audio/SDL_audiocvt.c +++ b/src/audio/SDL_audiocvt.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for audio drivers to perform runtime conversion of audio format */ diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c index 1d4c5096c..667593ad2 100644 --- a/src/audio/SDL_audiodev.c +++ b/src/audio/SDL_audiodev.c @@ -19,10 +19,11 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Get the name of the audio device we use for output */ -#if defined(unix) || defined(__unix__) || defined(__riscos__) +#if SDL_AUDIO_DRIVER_OPENBSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO #include #include @@ -32,7 +33,7 @@ #include "SDL_audiodev_c.h" #ifndef _PATH_DEV_DSP -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NETBSD__) || defined(__OPENBSD__) #define _PATH_DEV_DSP "/dev/audio" #else #define _PATH_DEV_DSP "/dev/dsp" @@ -95,7 +96,7 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) return(audio_fd); } -#elif defined(_AIX) +#elif SDL_AUDIO_DRIVER_PAUD /* Get the name of the audio device we use for output */ @@ -175,4 +176,4 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) return -1; } -#endif /* UNIX system */ +#endif /* Audio driver selection */ diff --git a/src/audio/SDL_audiodev_c.h b/src/audio/SDL_audiodev_c.h index 4806edb1c..055fd6541 100644 --- a/src/audio/SDL_audiodev_c.h +++ b/src/audio/SDL_audiodev_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Open the audio device, storing the pathname in 'path' */ extern int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic); diff --git a/src/audio/SDL_audiomem.h b/src/audio/SDL_audiomem.h index a60e2c7d0..3d759eb3f 100644 --- a/src/audio/SDL_audiomem.h +++ b/src/audio/SDL_audiomem.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #define SDL_AllocAudioMem SDL_malloc #define SDL_FreeAudioMem SDL_free diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c index 5a55f849b..c59b1adf4 100644 --- a/src/audio/SDL_mixer.c +++ b/src/audio/SDL_mixer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This provides the default mixing callback for the SDL audio routines */ @@ -110,7 +111,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume) switch (format) { case AUDIO_U8: { -#if defined(__M68000__) && defined(__GNUC__) +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8); #else Uint8 src_sample; @@ -127,21 +128,21 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume) break; case AUDIO_S8: { -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) if (SDL_HasMMX()) { SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume); } else #endif -#if defined(USE_ASM_MIXER_VC) +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES) if (SDL_HasMMX()) { SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume); } else #endif -#if defined(__M68000__) && defined(__GNUC__) +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume); #else { @@ -174,7 +175,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume) break; case AUDIO_S16LSB: { -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) if (SDL_HasMMX()) { SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume); @@ -187,7 +188,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume) } else #endif -#if defined(__M68000__) && defined(__GNUC__) +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume); #else { @@ -220,7 +221,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume) break; case AUDIO_S16MSB: { -#if defined(__M68000__) && defined(__GNUC__) +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume); #else Sint16 src1, src2; diff --git a/src/audio/SDL_mixer_MMX.c b/src/audio/SDL_mixer_MMX.c index 2068ecf28..9496c70cc 100644 --- a/src/audio/SDL_mixer_MMX.c +++ b/src/audio/SDL_mixer_MMX.c @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + /* MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) @@ -12,7 +35,7 @@ * Mixing for 16 bit signed buffers ***********************************************/ -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume) { __asm__ __volatile__ ( diff --git a/src/audio/SDL_mixer_MMX.h b/src/audio/SDL_mixer_MMX.h index f95f6a334..9bd956119 100644 --- a/src/audio/SDL_mixer_MMX.h +++ b/src/audio/SDL_mixer_MMX.h @@ -6,6 +6,7 @@ Assumes buffer size in bytes is a multiple of 16 Assumes SDL_MIX_MAXVOLUME = 128 */ +#include "SDL_config.h" #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) diff --git a/src/audio/SDL_mixer_MMX_VC.c b/src/audio/SDL_mixer_MMX_VC.c index 8803b1929..606bd0c09 100644 --- a/src/audio/SDL_mixer_MMX_VC.c +++ b/src/audio/SDL_mixer_MMX_VC.c @@ -1,7 +1,29 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" #include "SDL_mixer_MMX_VC.h" -#if defined(USE_ASM_MIXER_VC) +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES) // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) // Converted to Intel ASM notation by Cth @@ -156,4 +178,4 @@ void SDL_MixAudio_MMX_S8_VC(char* dst,char* src,unsigned int nSize,int volume) } } -#endif /* USE_ASM_MIXER_VC */ +#endif /* SDL_ASSEMBLY_ROUTINES */ diff --git a/src/audio/SDL_mixer_MMX_VC.h b/src/audio/SDL_mixer_MMX_VC.h index 81a918ee2..5f221580a 100644 --- a/src/audio/SDL_mixer_MMX_VC.h +++ b/src/audio/SDL_mixer_MMX_VC.h @@ -1,7 +1,27 @@ -#ifdef _MSC_VER -#define USE_ASM_MIXER_VC -#endif -#if defined(USE_ASM_MIXER_VC) +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES) // headers for MMX assembler version of SDL_MixAudio // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) // Converted to Intel ASM notation by Cth diff --git a/src/audio/SDL_mixer_m68k.c b/src/audio/SDL_mixer_m68k.c index 25fa1b323..f8786da24 100644 --- a/src/audio/SDL_mixer_m68k.c +++ b/src/audio/SDL_mixer_m68k.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* m68k assembly mix routines diff --git a/src/audio/SDL_mixer_m68k.h b/src/audio/SDL_mixer_m68k.h index d0ff5f217..d451dc43b 100644 --- a/src/audio/SDL_mixer_m68k.h +++ b/src/audio/SDL_mixer_m68k.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* m68k assembly mix routines diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h index b7e8377de..820dfe766 100644 --- a/src/audio/SDL_sysaudio.h +++ b/src/audio/SDL_sysaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_sysaudio_h #define _SDL_sysaudio_h @@ -161,9 +162,6 @@ extern AudioBootStrap DISKAUD_bootstrap; #if SDL_AUDIO_DRIVER_DC extern AudioBootStrap DCAUD_bootstrap; #endif -#if SDL_AUDIO_DRIVER_DRENDERER -extern AudioBootStrap DRENDERER_bootstrap; -#endif #if SDL_AUDIO_DRIVER_MMEAUDIO extern AudioBootStrap MMEAUDIO_bootstrap; #endif diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c index b11759c06..b55b9a6aa 100644 --- a/src/audio/SDL_wave.c +++ b/src/audio/SDL_wave.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Microsoft WAVE file loading routines */ diff --git a/src/audio/SDL_wave.h b/src/audio/SDL_wave.h index 38620cde7..e01ea77bb 100644 --- a/src/audio/SDL_wave.h +++ b/src/audio/SDL_wave.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* WAVE files are little-endian */ diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c index 98e719539..96e4c34d7 100644 --- a/src/audio/alsa/SDL_alsa_audio.c +++ b/src/audio/alsa/SDL_alsa_audio.c @@ -19,8 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - - +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/alsa/SDL_alsa_audio.h b/src/audio/alsa/SDL_alsa_audio.h index cbe27dba1..fd9ac0381 100644 --- a/src/audio/alsa/SDL_alsa_audio.h +++ b/src/audio/alsa/SDL_alsa_audio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _ALSA_PCM_audio_h #define _ALSA_PCM_audio_h diff --git a/src/audio/amigaos/SDL_ahiaudio.c b/src/audio/amigaos/SDL_ahiaudio.c index a6b5a6ad1..c9a4c1a4f 100644 --- a/src/audio/amigaos/SDL_ahiaudio.c +++ b/src/audio/amigaos/SDL_ahiaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer (for AmigaOS) */ diff --git a/src/audio/amigaos/SDL_ahiaudio.h b/src/audio/amigaos/SDL_ahiaudio.h index c059086c7..b9ef339c6 100644 --- a/src/audio/amigaos/SDL_ahiaudio.h +++ b/src/audio/amigaos/SDL_ahiaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_ahiaudio_h #define _SDL_ahiaudio_h diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c index 240ac4e4b..59949a52f 100644 --- a/src/audio/arts/SDL_artsaudio.c +++ b/src/audio/arts/SDL_artsaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/arts/SDL_artsaudio.h b/src/audio/arts/SDL_artsaudio.h index 114170f98..5569a3d49 100644 --- a/src/audio/arts/SDL_artsaudio.h +++ b/src/audio/arts/SDL_artsaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_artscaudio_h #define _SDL_artscaudio_h diff --git a/src/audio/baudio/SDL_beaudio.h b/src/audio/baudio/SDL_beaudio.h index 5a5e34c81..942c60ea3 100644 --- a/src/audio/baudio/SDL_beaudio.h +++ b/src/audio/baudio/SDL_beaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/audio/dart/SDL_dart.c b/src/audio/dart/SDL_dart.c index 00f58ae1d..6381de161 100644 --- a/src/audio/dart/SDL_dart.c +++ b/src/audio/dart/SDL_dart.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/dart/SDL_dart.h b/src/audio/dart/SDL_dart.h index 27a7faa3a..895da0040 100644 --- a/src/audio/dart/SDL_dart.h +++ b/src/audio/dart/SDL_dart.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/audio/dc/SDL_dcaudio.c b/src/audio/dc/SDL_dcaudio.c index d6327f7f4..8230534b5 100644 --- a/src/audio/dc/SDL_dcaudio.c +++ b/src/audio/dc/SDL_dcaudio.c @@ -20,6 +20,7 @@ slouken@libsdl.org */ +#include "SDL_config.h" /* Output dreamcast aica */ diff --git a/src/audio/dc/SDL_dcaudio.h b/src/audio/dc/SDL_dcaudio.h index b2d66a11a..2ad31294e 100644 --- a/src/audio/dc/SDL_dcaudio.h +++ b/src/audio/dc/SDL_dcaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_diskaudio_h #define _SDL_diskaudio_h diff --git a/src/audio/dc/aica.h b/src/audio/dc/aica.h index d9e7098e9..93155d281 100644 --- a/src/audio/dc/aica.h +++ b/src/audio/dc/aica.h @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + #ifndef _AICA_H_ #define _AICA_H_ diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c index cc5e9a324..04f50f337 100644 --- a/src/audio/disk/SDL_diskaudio.c +++ b/src/audio/disk/SDL_diskaudio.c @@ -22,6 +22,7 @@ This file hacked^H^H^H^H^H^Hwritten by Ryan C. Gordon (icculus@linuxgames.com) */ +#include "SDL_config.h" /* Output raw audio data to a file. */ diff --git a/src/audio/disk/SDL_diskaudio.h b/src/audio/disk/SDL_diskaudio.h index 7a80bf29c..891ae3412 100644 --- a/src/audio/disk/SDL_diskaudio.h +++ b/src/audio/disk/SDL_diskaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_diskaudio_h #define _SDL_diskaudio_h diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c index 10d4547f8..84734a3da 100644 --- a/src/audio/dma/SDL_dmaaudio.c +++ b/src/audio/dma/SDL_dmaaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ @@ -34,8 +35,6 @@ #include #include -#include "SDL_config.h" - #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H /* This is installed on some systems */ #include diff --git a/src/audio/dma/SDL_dmaaudio.h b/src/audio/dma/SDL_dmaaudio.h index f48e79196..ca8c05ad7 100644 --- a/src/audio/dma/SDL_dmaaudio.h +++ b/src/audio/dma/SDL_dmaaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dspaudio_h #define _SDL_dspaudio_h diff --git a/src/audio/dmedia/SDL_irixaudio.c b/src/audio/dmedia/SDL_irixaudio.c index 406a9375c..96cbaef67 100644 --- a/src/audio/dmedia/SDL_irixaudio.c +++ b/src/audio/dmedia/SDL_irixaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */ /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */ diff --git a/src/audio/dmedia/SDL_irixaudio.h b/src/audio/dmedia/SDL_irixaudio.h index dd8df3620..751de41f0 100644 --- a/src/audio/dmedia/SDL_irixaudio.h +++ b/src/audio/dmedia/SDL_irixaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c index 6804f1c51..7d2517b95 100644 --- a/src/audio/dsp/SDL_dspaudio.c +++ b/src/audio/dsp/SDL_dspaudio.c @@ -22,6 +22,7 @@ Modified in Oct 2004 by Hannu Savolainen hannu@opensound.com */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ @@ -35,8 +36,6 @@ #include #include -#include "SDL_config.h" - #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H /* This is installed on some systems */ #include diff --git a/src/audio/dsp/SDL_dspaudio.h b/src/audio/dsp/SDL_dspaudio.h index 8d62993bc..0bf803fc8 100644 --- a/src/audio/dsp/SDL_dspaudio.h +++ b/src/audio/dsp/SDL_dspaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dspaudio_h #define _SDL_dspaudio_h diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c index f63195b4d..6c30eb9b5 100644 --- a/src/audio/esd/SDL_esdaudio.c +++ b/src/audio/esd/SDL_esdaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to an ESD network stream mixing buffer */ @@ -244,7 +245,7 @@ static void ESD_CloseAudio(_THIS) static char *get_progname(void) { char *progname = NULL; -#ifdef linux +#ifdef __LINUX__ FILE *fp; static char temp[BUFSIZ]; diff --git a/src/audio/esd/SDL_esdaudio.h b/src/audio/esd/SDL_esdaudio.h index cdfa09732..cffb2768a 100644 --- a/src/audio/esd/SDL_esdaudio.h +++ b/src/audio/esd/SDL_esdaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_esdaudio_h #define _SDL_esdaudio_h diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c index 425b48986..7755d133c 100644 --- a/src/audio/macosx/SDL_coreaudio.c +++ b/src/audio/macosx/SDL_coreaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/audio/macosx/SDL_coreaudio.h b/src/audio/macosx/SDL_coreaudio.h index 93080a1f9..0902deddf 100644 --- a/src/audio/macosx/SDL_coreaudio.h +++ b/src/audio/macosx/SDL_coreaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_coreaudio_h #define _SDL_coreaudio_h diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c index f9002e2a3..e3901ebd3 100644 --- a/src/audio/macrom/SDL_romaudio.c +++ b/src/audio/macrom/SDL_romaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if defined(__APPLE__) && defined(__MACH__) # include @@ -92,7 +93,7 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex) this->UnlockAudio = Mac_UnlockAudio; this->free = Audio_DeleteDevice; -#ifdef MACOSX /* MacOS X uses threaded audio, so normal thread code is okay */ +#ifdef __MACOSX__ /* MacOS X uses threaded audio, so normal thread code is okay */ this->LockAudio = NULL; this->UnlockAudio = NULL; #endif @@ -120,7 +121,7 @@ static volatile Uint32 fill_me = 0; static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer) { if ( ! audio->paused ) { -#ifdef MACOSX +#ifdef __MACOSX__ SDL_mutexP(audio->mixer_lock); #endif if ( audio->convert.needed ) { @@ -134,7 +135,7 @@ static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer) } else { audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size); } -#ifdef MACOSX +#ifdef __MACOSX__ SDL_mutexV(audio->mixer_lock); #endif } diff --git a/src/audio/macrom/SDL_romaudio.h b/src/audio/macrom/SDL_romaudio.h index 28296d8d2..be5dc6961 100644 --- a/src/audio/macrom/SDL_romaudio.h +++ b/src/audio/macrom/SDL_romaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_romaudio_h #define _SDL_romaudio_h diff --git a/src/audio/mint/SDL_mintaudio.c b/src/audio/mint/SDL_mintaudio.c index 39e29e320..e63671267 100644 --- a/src/audio/mint/SDL_mintaudio.c +++ b/src/audio/mint/SDL_mintaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Audio interrupt variables and callback function diff --git a/src/audio/mint/SDL_mintaudio.h b/src/audio/mint/SDL_mintaudio.h index f679124ff..8f2193dab 100644 --- a/src/audio/mint/SDL_mintaudio.h +++ b/src/audio/mint/SDL_mintaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mint/SDL_mintaudio_dma8.c b/src/audio/mint/SDL_mintaudio_dma8.c index 2b9fea3a4..99b0d75bf 100644 --- a/src/audio/mint/SDL_mintaudio_dma8.c +++ b/src/audio/mint/SDL_mintaudio_dma8.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mint/SDL_mintaudio_dma8.h b/src/audio/mint/SDL_mintaudio_dma8.h index 3ef50a244..698fed4e5 100644 --- a/src/audio/mint/SDL_mintaudio_dma8.h +++ b/src/audio/mint/SDL_mintaudio_dma8.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* DMA 8bits and Falcon Codec audio definitions diff --git a/src/audio/mint/SDL_mintaudio_gsxb.c b/src/audio/mint/SDL_mintaudio_gsxb.c index 5af835d11..2e2efc121 100644 --- a/src/audio/mint/SDL_mintaudio_gsxb.c +++ b/src/audio/mint/SDL_mintaudio_gsxb.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mint/SDL_mintaudio_gsxb.h b/src/audio/mint/SDL_mintaudio_gsxb.h index 21bb96f36..595e313db 100644 --- a/src/audio/mint/SDL_mintaudio_gsxb.h +++ b/src/audio/mint/SDL_mintaudio_gsxb.h @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + /* * GSXB audio definitions * diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c index 99bcd2c3d..e60d6d887 100644 --- a/src/audio/mint/SDL_mintaudio_mcsn.c +++ b/src/audio/mint/SDL_mintaudio_mcsn.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mint/SDL_mintaudio_mcsn.h b/src/audio/mint/SDL_mintaudio_mcsn.h index 6ced9cbcc..f253ddd88 100644 --- a/src/audio/mint/SDL_mintaudio_mcsn.h +++ b/src/audio/mint/SDL_mintaudio_mcsn.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MCSN control structure diff --git a/src/audio/mint/SDL_mintaudio_stfa.c b/src/audio/mint/SDL_mintaudio_stfa.c index b3ac0e580..867937e23 100644 --- a/src/audio/mint/SDL_mintaudio_stfa.c +++ b/src/audio/mint/SDL_mintaudio_stfa.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mint/SDL_mintaudio_stfa.h b/src/audio/mint/SDL_mintaudio_stfa.h index 4618b0995..d4bf2d6b4 100644 --- a/src/audio/mint/SDL_mintaudio_stfa.h +++ b/src/audio/mint/SDL_mintaudio_stfa.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* STFA control structure diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c index 89c0afac5..dcb601911 100644 --- a/src/audio/mint/SDL_mintaudio_xbios.c +++ b/src/audio/mint/SDL_mintaudio_xbios.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MiNT audio driver diff --git a/src/audio/mme/SDL_mmeaudio.c b/src/audio/mme/SDL_mmeaudio.c index 77435905c..cb4d2bed4 100644 --- a/src/audio/mme/SDL_mmeaudio.c +++ b/src/audio/mme/SDL_mmeaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Tru64 UNIX MME support */ #include diff --git a/src/audio/mme/SDL_mmeaudio.h b/src/audio/mme/SDL_mmeaudio.h index f589dedb9..06d9d8385 100644 --- a/src/audio/mme/SDL_mmeaudio.h +++ b/src/audio/mme/SDL_mmeaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c index dd479a74e..b5d2a3bcf 100644 --- a/src/audio/nas/SDL_nasaudio.c +++ b/src/audio/nas/SDL_nasaudio.c @@ -23,6 +23,7 @@ Erik Inge Bolsø knan@mo.himolde.no */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/nas/SDL_nasaudio.h b/src/audio/nas/SDL_nasaudio.h index 658ade12f..390d6698b 100644 --- a/src/audio/nas/SDL_nasaudio.h +++ b/src/audio/nas/SDL_nasaudio.h @@ -23,6 +23,7 @@ Erik Inge Bolsø knan@mo.himolde.no */ +#include "SDL_config.h" #ifndef _SDL_nasaudio_h #define _SDL_nasaudio_h diff --git a/src/audio/nto/SDL_nto_audio.c b/src/audio/nto/SDL_nto_audio.c index 353cac4e4..db86bae27 100644 --- a/src/audio/nto/SDL_nto_audio.c +++ b/src/audio/nto/SDL_nto_audio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/audio/nto/SDL_nto_audio.h b/src/audio/nto/SDL_nto_audio.h index 967a93724..14fd00d47 100644 --- a/src/audio/nto/SDL_nto_audio.h +++ b/src/audio/nto/SDL_nto_audio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_NTO_AUDIO_H__ #define __SDL_NTO_AUDIO_H__ diff --git a/src/audio/openbsd/SDL_openbsdaudio.c b/src/audio/openbsd/SDL_openbsdaudio.c index 1e036b5d4..9bf089710 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.c +++ b/src/audio/openbsd/SDL_openbsdaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Driver for native OpenBSD audio(4). diff --git a/src/audio/openbsd/SDL_openbsdaudio.h b/src/audio/openbsd/SDL_openbsdaudio.h index 7b3fd1d44..8e8db89e9 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.h +++ b/src/audio/openbsd/SDL_openbsdaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_openbsdaudio_h #define _SDL_openbsdaudio_h diff --git a/src/audio/paudio/SDL_paudio.c b/src/audio/paudio/SDL_paudio.c index d880908e1..7b07b5981 100644 --- a/src/audio/paudio/SDL_paudio.c +++ b/src/audio/paudio/SDL_paudio.c @@ -21,6 +21,7 @@ based on linux/SDL_dspaudio.c by Sam Lantinga */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/paudio/SDL_paudio.h b/src/audio/paudio/SDL_paudio.h index f5fa3434e..a3f22edae 100644 --- a/src/audio/paudio/SDL_paudio.h +++ b/src/audio/paudio/SDL_paudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_paudaudio_h #define _SDL_paudaudio_h diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c index f20bca401..1e6277edf 100644 --- a/src/audio/sun/SDL_sunaudio.c +++ b/src/audio/sun/SDL_sunaudio.c @@ -19,12 +19,13 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ #include #include -#ifdef __NetBSD__ +#ifdef __NETBSD__ #include #include #endif diff --git a/src/audio/sun/SDL_sunaudio.h b/src/audio/sun/SDL_sunaudio.h index 0a174b9c0..51b0d5e85 100644 --- a/src/audio/sun/SDL_sunaudio.h +++ b/src/audio/sun/SDL_sunaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/audio/ums/SDL_umsaudio.c b/src/audio/ums/SDL_umsaudio.c index d31684f80..90bcd9b5b 100644 --- a/src/audio/ums/SDL_umsaudio.c +++ b/src/audio/ums/SDL_umsaudio.c @@ -21,6 +21,7 @@ based on linux/SDL_dspaudio.c by Sam Lantinga */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/ums/SDL_umsaudio.h b/src/audio/ums/SDL_umsaudio.h index c3ceb516e..97410cc2f 100644 --- a/src/audio/ums/SDL_umsaudio.h +++ b/src/audio/ums/SDL_umsaudio.h @@ -21,6 +21,7 @@ based on linux/SDL_dspaudio.h by Sam Lantinga */ +#include "SDL_config.h" #ifndef _SDL_UMSaudio_h #define _SDL_UMSaudio_h diff --git a/src/audio/windib/SDL_dibaudio.c b/src/audio/windib/SDL_dibaudio.c index 2777f6866..312438422 100644 --- a/src/audio/windib/SDL_dibaudio.c +++ b/src/audio/windib/SDL_dibaudio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/windib/SDL_dibaudio.h b/src/audio/windib/SDL_dibaudio.h index 3474f254b..f6a6e0857 100644 --- a/src/audio/windib/SDL_dibaudio.h +++ b/src/audio/windib/SDL_dibaudio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/audio/windx5/SDL_dx5audio.c b/src/audio/windx5/SDL_dx5audio.c index 1256fbf6a..48714dd11 100644 --- a/src/audio/windx5/SDL_dx5audio.c +++ b/src/audio/windx5/SDL_dx5audio.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Allow access to a raw mixing buffer */ diff --git a/src/audio/windx5/SDL_dx5audio.h b/src/audio/windx5/SDL_dx5audio.h index 691c1a699..52cec130e 100644 --- a/src/audio/windx5/SDL_dx5audio.h +++ b/src/audio/windx5/SDL_dx5audio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h diff --git a/src/cdrom/SDL_cdrom.c b/src/cdrom/SDL_cdrom.c index ae9dbb527..e842b5a68 100644 --- a/src/cdrom/SDL_cdrom.c +++ b/src/cdrom/SDL_cdrom.c @@ -19,13 +19,14 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the CD-audio control API for Simple DirectMedia Layer */ #include "SDL_cdrom.h" #include "SDL_syscdrom.h" -#if !defined(macintosh) +#if !defined(__MACOS__) #define CLIP_FRAMES 10 /* Some CD-ROMs won't go all the way */ #endif diff --git a/src/cdrom/SDL_syscdrom.h b/src/cdrom/SDL_syscdrom.h index 5a3b0ebc9..b51e07b5e 100644 --- a/src/cdrom/SDL_syscdrom.h +++ b/src/cdrom/SDL_syscdrom.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the system specific header for the SDL CD-ROM API */ diff --git a/src/cdrom/aix/SDL_syscdrom.c b/src/cdrom/aix/SDL_syscdrom.c index 676536060..73a86eade 100644 --- a/src/cdrom/aix/SDL_syscdrom.c +++ b/src/cdrom/aix/SDL_syscdrom.c @@ -21,6 +21,7 @@ based on linux/SDL_syscdrom.c by Sam Lantinga */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/bsdi/SDL_syscdrom.c b/src/cdrom/bsdi/SDL_syscdrom.c index 3872851e7..2fb405490 100644 --- a/src/cdrom/bsdi/SDL_syscdrom.c +++ b/src/cdrom/bsdi/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Functions for system-level CD-ROM audio control for BSD/OS 4.x diff --git a/src/cdrom/dc/SDL_syscdrom.c b/src/cdrom/dc/SDL_syscdrom.c index eb1c6a277..3f79a8c6e 100644 --- a/src/cdrom/dc/SDL_syscdrom.c +++ b/src/cdrom/dc/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/dummy/SDL_syscdrom.c b/src/cdrom/dummy/SDL_syscdrom.c index c8b7380f6..d5327e7b9 100644 --- a/src/cdrom/dummy/SDL_syscdrom.c +++ b/src/cdrom/dummy/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Stub functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/freebsd/SDL_syscdrom.c b/src/cdrom/freebsd/SDL_syscdrom.c index badebf48c..0db585e50 100644 --- a/src/cdrom/freebsd/SDL_syscdrom.c +++ b/src/cdrom/freebsd/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/linux/SDL_syscdrom.c b/src/cdrom/linux/SDL_syscdrom.c index 5d2db0656..766ec581f 100644 --- a/src/cdrom/linux/SDL_syscdrom.c +++ b/src/cdrom/linux/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ @@ -29,7 +30,7 @@ #include #include #include -#ifdef __linux__ +#ifdef __LINUX__ #ifdef HAVE_LINUX_VERSION_H /* linux 2.6.9 workaround */ #include diff --git a/src/cdrom/macos/SDL_syscdrom.c b/src/cdrom/macos/SDL_syscdrom.c index 668535ea1..ba2e201c9 100644 --- a/src/cdrom/macos/SDL_syscdrom.c +++ b/src/cdrom/macos/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MacOS functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/macos/SDL_syscdrom_c.h b/src/cdrom/macos/SDL_syscdrom_c.h index 60e8817eb..835826e27 100644 --- a/src/cdrom/macos/SDL_syscdrom_c.h +++ b/src/cdrom/macos/SDL_syscdrom_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the MacOS specific header for the SDL CD-ROM API Contributed by Matt Slot diff --git a/src/cdrom/macosx/AudioFilePlayer.c b/src/cdrom/macosx/AudioFilePlayer.c index 4eb52e399..9f4f72e9a 100644 --- a/src/cdrom/macosx/AudioFilePlayer.c +++ b/src/cdrom/macosx/AudioFilePlayer.c @@ -22,6 +22,7 @@ This file based on Apple sample code. We haven't changed the file name, so if you want to see the original search for it on apple.com/developer */ +#include "SDL_config.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // AudioFilePlayer.cpp diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h index 3b1c37a5c..8b45b2d2e 100644 --- a/src/cdrom/macosx/AudioFilePlayer.h +++ b/src/cdrom/macosx/AudioFilePlayer.h @@ -22,6 +22,7 @@ This file based on Apple sample code. We haven't changed the file name, so if you want to see the original search for it on apple.com/developer */ +#include "SDL_config.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // AudioFilePlayer.h diff --git a/src/cdrom/macosx/AudioFileReaderThread.c b/src/cdrom/macosx/AudioFileReaderThread.c index cfd6ff017..d7d659f07 100644 --- a/src/cdrom/macosx/AudioFileReaderThread.c +++ b/src/cdrom/macosx/AudioFileReaderThread.c @@ -22,6 +22,7 @@ This file based on Apple sample code. We haven't changed the file name, so if you want to see the original search for it on apple.com/developer */ +#include "SDL_config.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // AudioFileManager.cpp diff --git a/src/cdrom/macosx/CDPlayer.c b/src/cdrom/macosx/CDPlayer.c index 8a5a22f2c..9d40cad4a 100644 --- a/src/cdrom/macosx/CDPlayer.c +++ b/src/cdrom/macosx/CDPlayer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "CDPlayer.h" #include "AudioFilePlayer.h" diff --git a/src/cdrom/macosx/CDPlayer.h b/src/cdrom/macosx/CDPlayer.h index b8648e5ac..0e00a0ae9 100644 --- a/src/cdrom/macosx/CDPlayer.h +++ b/src/cdrom/macosx/CDPlayer.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __CDPlayer__H__ #define __CDPlayer__H__ 1 diff --git a/src/cdrom/macosx/SDLOSXCAGuard.c b/src/cdrom/macosx/SDLOSXCAGuard.c index 33b3c6197..099821537 100644 --- a/src/cdrom/macosx/SDLOSXCAGuard.c +++ b/src/cdrom/macosx/SDLOSXCAGuard.c @@ -19,6 +19,8 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" + /* Note: This file hasn't been modified so technically we have to keep the disclaimer :-( diff --git a/src/cdrom/macosx/SDLOSXCAGuard.h b/src/cdrom/macosx/SDLOSXCAGuard.h index d5e5b164e..3108ca748 100644 --- a/src/cdrom/macosx/SDLOSXCAGuard.h +++ b/src/cdrom/macosx/SDLOSXCAGuard.h @@ -19,6 +19,8 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" + /* Note: This file hasn't been modified so technically we have to keep the disclaimer :-( diff --git a/src/cdrom/macosx/SDL_syscdrom.c b/src/cdrom/macosx/SDL_syscdrom.c index 098bba527..2bb6636f3 100644 --- a/src/cdrom/macosx/SDL_syscdrom.c +++ b/src/cdrom/macosx/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_syscdrom_c.h" diff --git a/src/cdrom/macosx/SDL_syscdrom_c.h b/src/cdrom/macosx/SDL_syscdrom_c.h index 7c2e390df..cc13198ef 100644 --- a/src/cdrom/macosx/SDL_syscdrom_c.h +++ b/src/cdrom/macosx/SDL_syscdrom_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the Mac OS X / CoreAudio specific header for the SDL CD-ROM API Contributed by Darrell Walisser and Max Horn diff --git a/src/cdrom/mint/SDL_syscdrom.c b/src/cdrom/mint/SDL_syscdrom.c index a176caea2..990f2569d 100644 --- a/src/cdrom/mint/SDL_syscdrom.c +++ b/src/cdrom/mint/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Atari MetaDOS CD-ROM functions diff --git a/src/cdrom/openbsd/SDL_syscdrom.c b/src/cdrom/openbsd/SDL_syscdrom.c index 8c28b0ce8..3c332aa6f 100644 --- a/src/cdrom/openbsd/SDL_syscdrom.c +++ b/src/cdrom/openbsd/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ @@ -131,9 +132,9 @@ static void AddDrive(char *drive, struct stat *stbuf) int SDL_SYS_CDInit(void) { static char *checklist[] = { -#ifdef __OpenBSD__ +#if defined(__OPENBSD__) "?0 cd?c", "cdrom", NULL -#elif defined(__NetBSD__) +#elif defined(__NETBSD__) "?0 cd?d", "?0 cd?c", "cdrom", NULL #else "?0 cd?c", "?0 acd?c", "cdrom", NULL diff --git a/src/cdrom/os2/SDL_syscdrom.c b/src/cdrom/os2/SDL_syscdrom.c index eb8595ad2..8592292fb 100644 --- a/src/cdrom/os2/SDL_syscdrom.c +++ b/src/cdrom/os2/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/osf/SDL_syscdrom.c b/src/cdrom/osf/SDL_syscdrom.c index e8c943a7c..f05c103f7 100644 --- a/src/cdrom/osf/SDL_syscdrom.c +++ b/src/cdrom/osf/SDL_syscdrom.c @@ -18,7 +18,7 @@ */ - +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/qnx/SDL_syscdrom.c b/src/cdrom/qnx/SDL_syscdrom.c index df74e2e6e..c95394806 100644 --- a/src/cdrom/qnx/SDL_syscdrom.c +++ b/src/cdrom/qnx/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cdrom/win32/SDL_syscdrom.c b/src/cdrom/win32/SDL_syscdrom.c index 9242f5c48..8cf1a8d51 100644 --- a/src/cdrom/win32/SDL_syscdrom.c +++ b/src/cdrom/win32/SDL_syscdrom.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Functions for system-level CD-ROM audio control */ diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c index 5d16dbd59..626f921bc 100644 --- a/src/cpuinfo/SDL_cpuinfo.c +++ b/src/cpuinfo/SDL_cpuinfo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* CPU feature detection for SDL */ @@ -30,7 +31,7 @@ #include #endif -#if MACOSX +#ifdef __MACOSX__ #include /* For AltiVec check */ #endif @@ -307,7 +308,7 @@ static __inline__ int CPU_haveSSE2() static __inline__ int CPU_haveAltiVec() { volatile int altivec = 0; -#if MACOSX +#ifdef __MACOSX__ int selectors[2] = { CTL_HW, HW_VECTORUNIT }; int hasVectorUnit = 0; size_t length = sizeof(hasVectorUnit); diff --git a/src/events/SDL_active.c b/src/events/SDL_active.c index 91aea5c1d..17b5908a8 100644 --- a/src/events/SDL_active.c +++ b/src/events/SDL_active.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Application focus/iconification handling code for SDL */ diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index 807fc830d..ac038be54 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General event handling code for SDL */ @@ -150,7 +151,7 @@ static int SDL_StartEventThread(Uint32 flags) #if !SDL_THREADS_DISABLED SDL_EventQ.lock = SDL_CreateMutex(); if ( SDL_EventQ.lock == NULL ) { -#ifdef macintosh /* MacOS classic you can't multithread, so no lock needed */ +#ifdef __MACOS__ /* MacOS classic you can't multithread, so no lock needed */ ; #else return(-1); @@ -168,7 +169,7 @@ static int SDL_StartEventThread(Uint32 flags) /* The event thread will handle timers too */ SDL_SetTimerThreaded(2); -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread SDL_EventThread = SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL); #else diff --git a/src/events/SDL_events_c.h b/src/events/SDL_events_c.h index 84f870fc3..2b6d55fe7 100644 --- a/src/events/SDL_events_c.h +++ b/src/events/SDL_events_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful functions and variables from SDL_events.c */ #include "SDL_events.h" diff --git a/src/events/SDL_expose.c b/src/events/SDL_expose.c index 842254070..d325ea112 100644 --- a/src/events/SDL_expose.c +++ b/src/events/SDL_expose.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Refresh event handling code for SDL */ diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c index 0b0850070..9cc6036c0 100644 --- a/src/events/SDL_keyboard.c +++ b/src/events/SDL_keyboard.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General keyboard handling code for SDL */ diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c index ac0750e38..15a0fa6a4 100644 --- a/src/events/SDL_mouse.c +++ b/src/events/SDL_mouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General mouse handling code for SDL */ diff --git a/src/events/SDL_quit.c b/src/events/SDL_quit.c index 00d3d3d14..591f3274a 100644 --- a/src/events/SDL_quit.c +++ b/src/events/SDL_quit.c @@ -19,11 +19,10 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General quit handling code for SDL */ -#include "SDL_config.h" - #ifdef HAVE_SIGNAL_H #include #endif diff --git a/src/events/SDL_resize.c b/src/events/SDL_resize.c index 42d25b533..f625f706c 100644 --- a/src/events/SDL_resize.c +++ b/src/events/SDL_resize.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Resize event handling code for SDL */ diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h index 3d1ce9c48..07d55b421 100644 --- a/src/events/SDL_sysevents.h +++ b/src/events/SDL_sysevents.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "../video/SDL_sysvideo.h" @@ -28,7 +29,7 @@ #define MUST_THREAD_EVENTS #endif -#ifdef WIN32 /* Win32 doesn't allow a separate event thread */ +#ifdef __WIN32__ /* Win32 doesn't allow a separate event thread */ #define CANT_THREAD_EVENTS #endif @@ -36,7 +37,7 @@ #define CANT_THREAD_EVENTS #endif -#ifdef macintosh /* MacOS 7/8 don't support preemptive multi-tasking */ +#ifdef __MACOS__ /* MacOS 7/8 don't support preemptive multi-tasking */ #define CANT_THREAD_EVENTS #endif diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index b98ffffce..5f4242d6a 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This file provides a general interface for SDL to read and write data sources. It can easily be extended to files, memory, etc. @@ -147,14 +148,14 @@ static int mem_close(SDL_RWops *context) } /* Functions to create SDL_RWops structures from various data sources */ -#ifdef WIN32 +#ifdef __WIN32__ /* Aggh. You can't (apparently) open a file in an application and read from it in a DLL. */ static int in_sdl = 0; #endif -#ifdef macintosh +#ifdef __MACOS__ /* * translate unix-style slash-separated filename to mac-style colon-separated * name; return malloced string @@ -196,7 +197,7 @@ static char *unix_to_mac(const char *file) *dst++ = '\0'; return path; } -#endif /* macintosh */ +#endif /* __MACOS__ */ SDL_RWops *SDL_RWFromFile(const char *file, const char *mode) { @@ -204,7 +205,7 @@ SDL_RWops *SDL_RWFromFile(const char *file, const char *mode) #ifdef HAVE_STDIO_H FILE *fp; -#ifdef macintosh +#ifdef __MACOS__ { char *mpath = unix_to_mac(file); fp = fopen(mpath, mode); @@ -216,7 +217,7 @@ SDL_RWops *SDL_RWFromFile(const char *file, const char *mode) if ( fp == NULL ) { SDL_SetError("Couldn't open %s", file); } else { -#ifdef WIN32 +#ifdef __WIN32__ in_sdl = 1; rwops = SDL_RWFromFP(fp, 1); in_sdl = 0; @@ -233,7 +234,7 @@ SDL_RWops *SDL_RWFromFP(FILE *fp, int autoclose) { SDL_RWops *rwops = NULL; -#ifdef WIN32 +#ifdef __WIN32__ if ( ! in_sdl ) { /* It's when SDL and the app are compiled with different C runtimes */ SDL_SetError("You can't pass a FILE pointer to a DLL (?)"); diff --git a/src/hermes/HeadMMX.h b/src/hermes/HeadMMX.h index 237bfcee5..11cf6da5b 100644 --- a/src/hermes/HeadMMX.h +++ b/src/hermes/HeadMMX.h @@ -6,6 +6,7 @@ Please refer to the file COPYING.LIB contained in the distribution for licensing conditions */ +#include "SDL_config.h" #ifndef __HERMES_HEAD_MMX__ #define __HERMES_HEAD_MMX__ diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 1d6b01e70..9a3f56e5b 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the joystick API for Simple DirectMedia Layer */ diff --git a/src/joystick/SDL_joystick_c.h b/src/joystick/SDL_joystick_c.h index 697713797..2cb1e3be6 100644 --- a/src/joystick/SDL_joystick_c.h +++ b/src/joystick/SDL_joystick_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful functions and variables from SDL_joystick.c */ #include "SDL_joystick.h" diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h index 06bd5b19f..16c534c11 100644 --- a/src/joystick/SDL_sysjoystick.h +++ b/src/joystick/SDL_sysjoystick.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the system specific header for the SDL joystick API */ diff --git a/src/joystick/amigaos/SDL_sysjoystick.c b/src/joystick/amigaos/SDL_sysjoystick.c index ae0d767eb..7e59f9d35 100644 --- a/src/joystick/amigaos/SDL_sysjoystick.c +++ b/src/joystick/amigaos/SDL_sysjoystick.c @@ -19,7 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - +#include "SDL_config.h" /* This is the system specific header for the SDL joystick API */ diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 2116defc0..d40b4f01a 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Joystick driver for the uhid(4) interface found in OpenBSD, @@ -47,12 +48,12 @@ #include #endif -#ifdef __FreeBSD__ +#ifdef __FREEBSD__ #include #include #endif -#if defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__)) +#if defined(__NETBSD__) || (defined(__OPENBSD__) && defined(__i386__)) #include #endif @@ -281,7 +282,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) goto usberr; } -#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111) +#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_version >= 500111) hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid); #else hdata = hid_start_parse(hw->repdesc, 1 << hid_input); @@ -361,7 +362,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy) int nbutton, naxe = -1; Sint32 v; -#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__)) +#if defined(__FREEBSD__) || defined(__NETBSD__) || (defined(__OPENBSD__) && defined(__i386__)) struct joystick gameport; static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0; @@ -410,14 +411,14 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy) } return; } -#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */ +#endif /* defined(__FREEBSD__) || defined(__NETBSD__) || defined(__OPENBSD__) */ rep = &joy->hwdata->inreport; if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) { return; } -#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111) +#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_version >= 500111) hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid); #else hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input); @@ -509,7 +510,7 @@ report_alloc(struct report *r, struct report_desc *rd, int repind) { int len; -#ifdef __FreeBSD__ +#ifdef __FREEBSD__ # if (__FreeBSD_version >= 460000) # if (__FreeBSD_version <= 500111) len = hid_report_size(rd, r->rid, repinfo[repind].kind); diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c index a41de156f..92829b3a7 100644 --- a/src/joystick/darwin/SDL_sysjoystick.c +++ b/src/joystick/darwin/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */ /* Written 2001 by Max Horn */ diff --git a/src/joystick/dc/SDL_sysjoystick.c b/src/joystick/dc/SDL_sysjoystick.c index 6c739fefa..1f40d0e1f 100644 --- a/src/joystick/dc/SDL_sysjoystick.c +++ b/src/joystick/dc/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c index 953bd0ce8..6994ef95d 100644 --- a/src/joystick/dummy/SDL_sysjoystick.c +++ b/src/joystick/dummy/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the system specific header for the SDL joystick API */ diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 80cde2398..2b596371d 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the system specific header for the SDL joystick API */ diff --git a/src/joystick/macos/SDL_sysjoystick.c b/src/joystick/macos/SDL_sysjoystick.c index 357f2edb6..40b4e6f50 100644 --- a/src/joystick/macos/SDL_sysjoystick.c +++ b/src/joystick/macos/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL stuff -- "SDL_sysjoystick.c" MacOS joystick functions by Frederick Reitberger diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c index e775504f4..91bc8ae0f 100644 --- a/src/joystick/mint/SDL_sysjoystick.c +++ b/src/joystick/mint/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari Joystick/Joypad drivers diff --git a/src/joystick/os2/SDL_sysjoystick.c b/src/joystick/os2/SDL_sysjoystick.c index 9d7f7ce1c..b7cc02923 100644 --- a/src/joystick/os2/SDL_sysjoystick.c +++ b/src/joystick/os2/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* OS/2 Joystick driver, contributed by Daniel Caetano */ diff --git a/src/joystick/riscos/SDL_sysjoystick.c b/src/joystick/riscos/SDL_sysjoystick.c index ab12f6981..70ac1769b 100644 --- a/src/joystick/riscos/SDL_sysjoystick.c +++ b/src/joystick/riscos/SDL_sysjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003 diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/win32/SDL_mmjoystick.c index a020ae9f9..2be33f917 100644 --- a/src/joystick/win32/SDL_mmjoystick.c +++ b/src/joystick/win32/SDL_mmjoystick.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ diff --git a/src/loadso/beos/SDL_sysloadso.c b/src/loadso/beos/SDL_sysloadso.c index 089df5bda..27892b927 100644 --- a/src/loadso/beos/SDL_sysloadso.c +++ b/src/loadso/beos/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/dlopen/SDL_sysloadso.c b/src/loadso/dlopen/SDL_sysloadso.c index 3a084adda..498745da5 100644 --- a/src/loadso/dlopen/SDL_sysloadso.c +++ b/src/loadso/dlopen/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/dummy/SDL_sysloadso.c b/src/loadso/dummy/SDL_sysloadso.c index 7795893f2..ff8e7e2c7 100644 --- a/src/loadso/dummy/SDL_sysloadso.c +++ b/src/loadso/dummy/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/macos/SDL_sysloadso.c b/src/loadso/macos/SDL_sysloadso.c index be65a54a7..4deca7b5c 100644 --- a/src/loadso/macos/SDL_sysloadso.c +++ b/src/loadso/macos/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/macosx/SDL_sysloadso.c b/src/loadso/macosx/SDL_sysloadso.c index 16f49a3c2..e97b91c97 100644 --- a/src/loadso/macosx/SDL_sysloadso.c +++ b/src/loadso/macosx/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Please note that dlcompat apparently ships in current Mac OS X versions * as a system library that provides compatibility with the Unix "dlopen" diff --git a/src/loadso/mint/SDL_sysloadso.c b/src/loadso/mint/SDL_sysloadso.c index 2e13106f9..f9eacd422 100644 --- a/src/loadso/mint/SDL_sysloadso.c +++ b/src/loadso/mint/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/os2/SDL_sysloadso.c b/src/loadso/os2/SDL_sysloadso.c index 2e5af151c..0918043d4 100644 --- a/src/loadso/os2/SDL_sysloadso.c +++ b/src/loadso/os2/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ diff --git a/src/loadso/win32/SDL_sysloadso.c b/src/loadso/win32/SDL_sysloadso.c index 4001f16c1..b1ac194df 100644 --- a/src/loadso/win32/SDL_sysloadso.c +++ b/src/loadso/win32/SDL_sysloadso.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -55,7 +56,7 @@ void *SDL_LoadObject(const char *sofile) SDL_free(sofile_t); SDL_free(errbuf_t); -#else /*if defined(WIN32)*/ +#else /*if defined(__WIN32__)*/ char errbuf[512]; handle = (void *)LoadLibrary(sofile); diff --git a/src/main/beos/SDL_BeApp.h b/src/main/beos/SDL_BeApp.h index cb110dda9..f55dc1d80 100644 --- a/src/main/beos/SDL_BeApp.h +++ b/src/main/beos/SDL_BeApp.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the BeApp specific portions of the application */ diff --git a/src/stdlib/SDL_getenv.c b/src/stdlib/SDL_getenv.c index 23f5c6bc8..ab996ca35 100644 --- a/src/stdlib/SDL_getenv.c +++ b/src/stdlib/SDL_getenv.c @@ -19,12 +19,13 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_stdinc.h" #ifndef HAVE_GETENV -#if defined(WIN32) && !defined(_WIN32_WCE) +#if defined(__WIN32__) && !defined(_WIN32_WCE) #include "SDL_windows.h" @@ -169,7 +170,7 @@ char *SDL_getenv(const char *name) return value; } -#endif /* WIN32 */ +#endif /* __WIN32__ */ #endif /* !HAVE_GETENV */ diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c index b7b72c286..1bfb08baa 100644 --- a/src/stdlib/SDL_malloc.c +++ b/src/stdlib/SDL_malloc.c @@ -19,7 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - +#include "SDL_config.h" /* This file contains portable memory management functions for SDL */ diff --git a/src/stdlib/SDL_qsort.c b/src/stdlib/SDL_qsort.c index 327667448..a3419d421 100644 --- a/src/stdlib/SDL_qsort.c +++ b/src/stdlib/SDL_qsort.c @@ -41,6 +41,7 @@ * * Gareth McCaughan Peterhouse Cambridge 1998 */ +#include "SDL_config.h" /* #include diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c index 120fcfe40..c8e2cf494 100644 --- a/src/stdlib/SDL_stdlib.c +++ b/src/stdlib/SDL_stdlib.c @@ -19,7 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - +#include "SDL_config.h" /* This file contains portable stdlib functions for SDL */ diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c index 3a2a9b890..54ca1d6ee 100644 --- a/src/stdlib/SDL_string.c +++ b/src/stdlib/SDL_string.c @@ -19,7 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - +#include "SDL_config.h" /* This file contains portable string manipulation functions for SDL */ diff --git a/src/thread/SDL_systhread.h b/src/thread/SDL_systhread.h index eefabcd16..960d21868 100644 --- a/src/thread/SDL_systhread.h +++ b/src/thread/SDL_systhread.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* These are functions that need to be implemented by a port of SDL */ @@ -31,7 +32,7 @@ saves a system-dependent thread id in thread->id, and returns 0 on success. */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(__WIN32__) || defined(__OS2__) extern int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); #else extern int SDL_SYS_CreateThread(SDL_Thread *thread, void *args); diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c index b4c8ae96c..2b673d175 100644 --- a/src/thread/SDL_thread.c +++ b/src/thread/SDL_thread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* System independent thread management routines for SDL */ @@ -208,7 +209,7 @@ void SDL_RunThread(void *data) *statusloc = userfunc(userdata); } -#if defined(_WIN32) || defined(__OS2__) +#if defined(__WIN32__) || defined(__OS2__) #undef SDL_CreateThread DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread) #else @@ -249,7 +250,7 @@ DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data) SDL_AddThread(thread); /* Create the thread and go! */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(__WIN32__) || defined(__OS2__) ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread); #else ret = SDL_SYS_CreateThread(thread, args); diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h index 4028a1deb..13501db6d 100644 --- a/src/thread/SDL_thread_c.h +++ b/src/thread/SDL_thread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_thread_c_h #define _SDL_thread_c_h diff --git a/src/thread/amigaos/SDL_syssem.c b/src/thread/amigaos/SDL_syssem.c index f917c8c10..a31a2133b 100644 --- a/src/thread/amigaos/SDL_syssem.c +++ b/src/thread/amigaos/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of semaphores using mutexes and condition variables */ diff --git a/src/thread/amigaos/SDL_systhread.c b/src/thread/amigaos/SDL_systhread.c index 80488a107..c6b42e776 100644 --- a/src/thread/amigaos/SDL_systhread.c +++ b/src/thread/amigaos/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* BeOS thread management routines for SDL */ diff --git a/src/thread/amigaos/SDL_systhread_c.h b/src/thread/amigaos/SDL_systhread_c.h index 0603a5b48..53ba3c8c6 100644 --- a/src/thread/amigaos/SDL_systhread_c.h +++ b/src/thread/amigaos/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/thread/amigaos/SDL_thread.c b/src/thread/amigaos/SDL_thread.c index cb90b6111..7698f49f3 100644 --- a/src/thread/amigaos/SDL_thread.c +++ b/src/thread/amigaos/SDL_thread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* System independent thread management routines for SDL */ diff --git a/src/thread/beos/SDL_syssem.c b/src/thread/beos/SDL_syssem.c index fff54da7b..5ea4f3735 100644 --- a/src/thread/beos/SDL_syssem.c +++ b/src/thread/beos/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Semaphores in the BeOS environment */ diff --git a/src/thread/beos/SDL_systhread.c b/src/thread/beos/SDL_systhread.c index f38e16639..904fcc770 100644 --- a/src/thread/beos/SDL_systhread.c +++ b/src/thread/beos/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* BeOS thread management routines for SDL */ diff --git a/src/thread/beos/SDL_systhread_c.h b/src/thread/beos/SDL_systhread_c.h index 8f0378b76..0d8d8546e 100644 --- a/src/thread/beos/SDL_systhread_c.h +++ b/src/thread/beos/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/thread/dc/SDL_syscond.c b/src/thread/dc/SDL_syscond.c index 73e17bc94..6a9d2dcc0 100644 --- a/src/thread/dc/SDL_syscond.c +++ b/src/thread/dc/SDL_syscond.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of condition variables using semaphores and mutexes */ /* diff --git a/src/thread/dc/SDL_syscond_c.h b/src/thread/dc/SDL_syscond_c.h index 39e122db7..27d55093a 100644 --- a/src/thread/dc/SDL_syscond_c.h +++ b/src/thread/dc/SDL_syscond_c.h @@ -19,4 +19,5 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" diff --git a/src/thread/dc/SDL_sysmutex.c b/src/thread/dc/SDL_sysmutex.c index 5cd66f91d..8e3d5f7a4 100644 --- a/src/thread/dc/SDL_sysmutex.c +++ b/src/thread/dc/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of mutexes using semaphores */ diff --git a/src/thread/dc/SDL_sysmutex_c.h b/src/thread/dc/SDL_sysmutex_c.h index 39e122db7..27d55093a 100644 --- a/src/thread/dc/SDL_sysmutex_c.h +++ b/src/thread/dc/SDL_sysmutex_c.h @@ -19,4 +19,5 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" diff --git a/src/thread/dc/SDL_syssem.c b/src/thread/dc/SDL_syssem.c index 1cf21e357..51ca8ff08 100644 --- a/src/thread/dc/SDL_syssem.c +++ b/src/thread/dc/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of semaphores using mutexes and condition variables */ diff --git a/src/thread/dc/SDL_syssem_c.h b/src/thread/dc/SDL_syssem_c.h index 39e122db7..27d55093a 100644 --- a/src/thread/dc/SDL_syssem_c.h +++ b/src/thread/dc/SDL_syssem_c.h @@ -19,4 +19,5 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" diff --git a/src/thread/dc/SDL_systhread.c b/src/thread/dc/SDL_systhread.c index c3318cae9..c5da4e799 100644 --- a/src/thread/dc/SDL_systhread.c +++ b/src/thread/dc/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Thread management routines for SDL */ diff --git a/src/thread/dc/SDL_systhread_c.h b/src/thread/dc/SDL_systhread_c.h index 6de1d6539..8f9553fb0 100644 --- a/src/thread/dc/SDL_systhread_c.h +++ b/src/thread/dc/SDL_systhread_c.h @@ -19,5 +19,6 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" typedef struct kthread* SYS_ThreadHandle; diff --git a/src/thread/epoc/SDL_systhread_c.h b/src/thread/epoc/SDL_systhread_c.h index e61db4983..6f5fd943b 100644 --- a/src/thread/epoc/SDL_systhread_c.h +++ b/src/thread/epoc/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_systhread_c.h diff --git a/src/thread/generic/SDL_syscond.c b/src/thread/generic/SDL_syscond.c index 73e17bc94..6a9d2dcc0 100644 --- a/src/thread/generic/SDL_syscond.c +++ b/src/thread/generic/SDL_syscond.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of condition variables using semaphores and mutexes */ /* diff --git a/src/thread/generic/SDL_sysmutex.c b/src/thread/generic/SDL_sysmutex.c index 5eadce34b..18099d24d 100644 --- a/src/thread/generic/SDL_sysmutex.c +++ b/src/thread/generic/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of mutexes using semaphores */ diff --git a/src/thread/generic/SDL_sysmutex_c.h b/src/thread/generic/SDL_sysmutex_c.h index 39e122db7..27d55093a 100644 --- a/src/thread/generic/SDL_sysmutex_c.h +++ b/src/thread/generic/SDL_sysmutex_c.h @@ -19,4 +19,5 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" diff --git a/src/thread/generic/SDL_syssem.c b/src/thread/generic/SDL_syssem.c index 30e9942f3..bc3ca6edf 100644 --- a/src/thread/generic/SDL_syssem.c +++ b/src/thread/generic/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of semaphores using mutexes and condition variables */ diff --git a/src/thread/generic/SDL_systhread.c b/src/thread/generic/SDL_systhread.c index f5d5e0ac1..6739ad49d 100644 --- a/src/thread/generic/SDL_systhread.c +++ b/src/thread/generic/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Thread management routines for SDL */ diff --git a/src/thread/generic/SDL_systhread_c.h b/src/thread/generic/SDL_systhread_c.h index 23c3e0271..7e876b066 100644 --- a/src/thread/generic/SDL_systhread_c.h +++ b/src/thread/generic/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Stub until we implement threads on this platform */ typedef int SYS_ThreadHandle; diff --git a/src/thread/irix/SDL_syssem.c b/src/thread/irix/SDL_syssem.c index 9f58748ef..5aefd3f1e 100644 --- a/src/thread/irix/SDL_syssem.c +++ b/src/thread/irix/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_thread.h" #include "SDL_timer.h" @@ -103,7 +104,7 @@ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) void SDL_DestroySemaphore(SDL_sem *sem) { if ( sem ) { -#ifdef _SGI_SOURCE +#ifdef __IRIX__ semctl(sem->id, 0, IPC_RMID); #else union semun dummy; @@ -193,7 +194,7 @@ Uint32 SDL_SemValue(SDL_sem *sem) value = 0; if ( sem ) { tryagain: -#ifdef _SGI_SOURCE +#ifdef __IRIX__ semval = semctl(sem->id, 0, GETVAL); #else { diff --git a/src/thread/irix/SDL_systhread.c b/src/thread/irix/SDL_systhread.c index 52e060104..16a865966 100644 --- a/src/thread/irix/SDL_systhread.c +++ b/src/thread/irix/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* IRIX thread management routines for SDL */ diff --git a/src/thread/irix/SDL_systhread_c.h b/src/thread/irix/SDL_systhread_c.h index 93a1ab2db..76e141a7f 100644 --- a/src/thread/irix/SDL_systhread_c.h +++ b/src/thread/irix/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/thread/os2/SDL_syscond.c b/src/thread/os2/SDL_syscond.c index bbb0af38f..25577e40d 100644 --- a/src/thread/os2/SDL_syscond.c +++ b/src/thread/os2/SDL_syscond.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* An implementation of condition variables using semaphores and mutexes */ /* diff --git a/src/thread/os2/SDL_syscond_c.h b/src/thread/os2/SDL_syscond_c.h index 39e122db7..27d55093a 100644 --- a/src/thread/os2/SDL_syscond_c.h +++ b/src/thread/os2/SDL_syscond_c.h @@ -19,4 +19,5 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" diff --git a/src/thread/os2/SDL_sysmutex.c b/src/thread/os2/SDL_sysmutex.c index ad3907531..ea75ccee0 100644 --- a/src/thread/os2/SDL_sysmutex.c +++ b/src/thread/os2/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Mutex functions using the OS/2 API */ diff --git a/src/thread/os2/SDL_syssem.c b/src/thread/os2/SDL_syssem.c index 2cb38fefc..d44593403 100644 --- a/src/thread/os2/SDL_syssem.c +++ b/src/thread/os2/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Semaphore functions using the OS/2 API */ diff --git a/src/thread/os2/SDL_systhread.c b/src/thread/os2/SDL_systhread.c index 34fe286ba..28893a93a 100644 --- a/src/thread/os2/SDL_systhread.c +++ b/src/thread/os2/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* OS/2 thread management routines for SDL */ diff --git a/src/thread/os2/SDL_systhread_c.h b/src/thread/os2/SDL_systhread_c.h index e578f3b2b..186419de7 100644 --- a/src/thread/os2/SDL_systhread_c.h +++ b/src/thread/os2/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #define INCL_DOSPROCESS #include diff --git a/src/thread/pth/SDL_syscond.c b/src/thread/pth/SDL_syscond.c index 899f8f569..715aff118 100644 --- a/src/thread/pth/SDL_syscond.c +++ b/src/thread/pth/SDL_syscond.c @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + /* * GNU pth conditions variables * diff --git a/src/thread/pth/SDL_sysmutex.c b/src/thread/pth/SDL_sysmutex.c index dacc24ecb..9d5b197c5 100644 --- a/src/thread/pth/SDL_sysmutex.c +++ b/src/thread/pth/SDL_sysmutex.c @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + /* * GNU pth mutexes * diff --git a/src/thread/pth/SDL_sysmutex_c.h b/src/thread/pth/SDL_sysmutex_c.h index 4a9bf2bc6..e0e9ef53a 100644 --- a/src/thread/pth/SDL_sysmutex_c.h +++ b/src/thread/pth/SDL_sysmutex_c.h @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + #ifndef _SDL_SYSMUTEX_C_H_ #define _SDL_SYSMUTEX_C_H_ diff --git a/src/thread/pth/SDL_systhread.c b/src/thread/pth/SDL_systhread.c index b05ad4d5a..45e6e806d 100644 --- a/src/thread/pth/SDL_systhread.c +++ b/src/thread/pth/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * GNU pth threads diff --git a/src/thread/pth/SDL_systhread_c.h b/src/thread/pth/SDL_systhread_c.h index cef0870cd..791eb1bdc 100644 --- a/src/thread/pth/SDL_systhread_c.h +++ b/src/thread/pth/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_SYSTHREAD_C_H_ #define _SDL_SYSTHREAD_C_H_ diff --git a/src/thread/pthread/SDL_syscond.c b/src/thread/pthread/SDL_syscond.c index 0c192b23d..333f83c71 100644 --- a/src/thread/pthread/SDL_syscond.c +++ b/src/thread/pthread/SDL_syscond.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/thread/pthread/SDL_sysmutex.c b/src/thread/pthread/SDL_sysmutex.c index 3249325c6..42e99b4ee 100644 --- a/src/thread/pthread/SDL_sysmutex.c +++ b/src/thread/pthread/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/thread/pthread/SDL_sysmutex_c.h b/src/thread/pthread/SDL_sysmutex_c.h index dd4760776..187e7c83e 100644 --- a/src/thread/pthread/SDL_sysmutex_c.h +++ b/src/thread/pthread/SDL_sysmutex_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_mutex_c_h #define _SDL_mutex_c_h diff --git a/src/thread/pthread/SDL_syssem.c b/src/thread/pthread/SDL_syssem.c index 2d976cf7b..a48a63419 100644 --- a/src/thread/pthread/SDL_syssem.c +++ b/src/thread/pthread/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include @@ -28,9 +29,9 @@ /* Wrapper around POSIX 1003.1b semaphores */ -#if MACOSX +#ifdef __MACOSX__ #define USE_NAMED_SEMAPHORES 1 -#endif /* MACOSX */ +#endif struct SDL_semaphore { sem_t *sem; diff --git a/src/thread/pthread/SDL_systhread.c b/src/thread/pthread/SDL_systhread.c index aad882d6e..61994d3a6 100644 --- a/src/thread/pthread/SDL_systhread.c +++ b/src/thread/pthread/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include @@ -96,7 +97,7 @@ void SDL_SYS_KillThread(SDL_Thread *thread) #ifdef PTHREAD_CANCEL_ASYNCHRONOUS pthread_cancel(thread->handle); #else -#ifdef __FreeBSD__ +#ifdef __FREEBSD__ #warning For some reason, this doesnt actually kill a thread - FreeBSD 3.2 #endif pthread_kill(thread->handle, SIGKILL); diff --git a/src/thread/pthread/SDL_systhread_c.h b/src/thread/pthread/SDL_systhread_c.h index b9732ba42..2aab23ab0 100644 --- a/src/thread/pthread/SDL_systhread_c.h +++ b/src/thread/pthread/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/thread/riscos/SDL_syscond.c b/src/thread/riscos/SDL_syscond.c index 609ad2226..c04739a98 100644 --- a/src/thread/riscos/SDL_syscond.c +++ b/src/thread/riscos/SDL_syscond.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* RISC OS implementations uses pthreads based on linux code */ diff --git a/src/thread/riscos/SDL_sysmutex.c b/src/thread/riscos/SDL_sysmutex.c index 06185876f..aa4d65ee9 100644 --- a/src/thread/riscos/SDL_sysmutex.c +++ b/src/thread/riscos/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* RISC OS implementations uses pthreads based on linux code */ diff --git a/src/thread/riscos/SDL_sysmutex_c.h b/src/thread/riscos/SDL_sysmutex_c.h index 3c4ee296b..fcd03d256 100644 --- a/src/thread/riscos/SDL_sysmutex_c.h +++ b/src/thread/riscos/SDL_sysmutex_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_mutex_c_h #define _SDL_mutex_c_h diff --git a/src/thread/riscos/SDL_syssem.c b/src/thread/riscos/SDL_syssem.c index 0210d7a3f..0e563883b 100644 --- a/src/thread/riscos/SDL_syssem.c +++ b/src/thread/riscos/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* RISC OS semiphores based on linux code */ diff --git a/src/thread/riscos/SDL_systhread.c b/src/thread/riscos/SDL_systhread.c index 18f8fe580..318bb9d60 100644 --- a/src/thread/riscos/SDL_systhread.c +++ b/src/thread/riscos/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* RISC OS version based on pthreads linux source */ diff --git a/src/thread/riscos/SDL_systhread_c.h b/src/thread/riscos/SDL_systhread_c.h index 17de1ff55..22867a627 100644 --- a/src/thread/riscos/SDL_systhread_c.h +++ b/src/thread/riscos/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if SDL_THREADS_DISABLED diff --git a/src/thread/win32/SDL_sysmutex.c b/src/thread/win32/SDL_sysmutex.c index 4f78d2f51..878a8ef2d 100644 --- a/src/thread/win32/SDL_sysmutex.c +++ b/src/thread/win32/SDL_sysmutex.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Mutex functions using the Win32 API */ diff --git a/src/thread/win32/SDL_syssem.c b/src/thread/win32/SDL_syssem.c index 6f1c4caa5..71bd17518 100644 --- a/src/thread/win32/SDL_syssem.c +++ b/src/thread/win32/SDL_syssem.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Semaphore functions using the Win32 API */ diff --git a/src/thread/win32/SDL_systhread.c b/src/thread/win32/SDL_systhread.c index 1da71def6..85770fe23 100644 --- a/src/thread/win32/SDL_systhread.c +++ b/src/thread/win32/SDL_systhread.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Win32 thread management routines for SDL */ diff --git a/src/thread/win32/SDL_systhread_c.h b/src/thread/win32/SDL_systhread_c.h index 356928017..2c7dcaa05 100644 --- a/src/thread/win32/SDL_systhread_c.h +++ b/src/thread/win32/SDL_systhread_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/timer/SDL_systimer.h b/src/timer/SDL_systimer.h index 13dfedf97..e9c7b3b30 100644 --- a/src/timer/SDL_systimer.h +++ b/src/timer/SDL_systimer.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* The system dependent timer handling functions */ diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c index a90c8e458..353b19fd7 100644 --- a/src/timer/SDL_timer.c +++ b/src/timer/SDL_timer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_timer.h" #include "SDL_timer_c.h" diff --git a/src/timer/SDL_timer_c.h b/src/timer/SDL_timer_c.h index e022a1f6a..a69cd12ac 100644 --- a/src/timer/SDL_timer_c.h +++ b/src/timer/SDL_timer_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful functions and variables from SDL_timer.c */ #include "SDL_timer.h" diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c index 6f030fffc..41cf82741 100644 --- a/src/timer/amigaos/SDL_systimer.c +++ b/src/timer/amigaos/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/timer/beos/SDL_systimer.c b/src/timer/beos/SDL_systimer.c index 45d9059bc..e929ef34c 100644 --- a/src/timer/beos/SDL_systimer.c +++ b/src/timer/beos/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/timer/dc/SDL_systimer.c b/src/timer/dc/SDL_systimer.c index d4a888031..e61792f39 100644 --- a/src/timer/dc/SDL_systimer.c +++ b/src/timer/dc/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/timer/dummy/SDL_systimer.c b/src/timer/dummy/SDL_systimer.c index a4bc823c9..4d6050e6e 100644 --- a/src/timer/dummy/SDL_systimer.c +++ b/src/timer/dummy/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" void SDL_StartTicks(void) { diff --git a/src/timer/macos/FastTimes.h b/src/timer/macos/FastTimes.h index d419f6752..bde8db763 100644 --- a/src/timer/macos/FastTimes.h +++ b/src/timer/macos/FastTimes.h @@ -1,4 +1,5 @@ /* File "FastTimes.h" - Original code by Matt Slot */ +#include "SDL_config.h" /* Created 4/24/99 - This file is hereby placed in the public domain */ /* Updated 5/21/99 - Calibrate to VIA, add TBR support, renamed functions */ /* Updated 10/4/99 - Use AbsoluteToNanoseconds() in case Absolute = double */ @@ -23,4 +24,4 @@ extern StringPtr FastMethod(void); /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ -#endif /* __FAST_TIMES_HEADER__ */ \ No newline at end of file +#endif /* __FAST_TIMES_HEADER__ */ diff --git a/src/timer/macos/SDL_MPWtimer.c b/src/timer/macos/SDL_MPWtimer.c index a2db6c726..cc6558f76 100644 --- a/src/timer/macos/SDL_MPWtimer.c +++ b/src/timer/macos/SDL_MPWtimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/timer/macos/SDL_systimer.c b/src/timer/macos/SDL_systimer.c index 345a9ad87..762762d8c 100644 --- a/src/timer/macos/SDL_systimer.c +++ b/src/timer/macos/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/timer/mint/SDL_systimer.c b/src/timer/mint/SDL_systimer.c index bff35cbc5..4cdf01d5b 100644 --- a/src/timer/mint/SDL_systimer.c +++ b/src/timer/mint/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * TOS/MiNT timer driver diff --git a/src/timer/mint/SDL_vbltimer_s.h b/src/timer/mint/SDL_vbltimer_s.h index 781850b22..6d1f4f5ce 100644 --- a/src/timer/mint/SDL_vbltimer_s.h +++ b/src/timer/mint/SDL_vbltimer_s.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * TOS/MiNT timer driver diff --git a/src/timer/os2/SDL_systimer.c b/src/timer/os2/SDL_systimer.c index 0439448b4..1a5f6ed9d 100644 --- a/src/timer/os2/SDL_systimer.c +++ b/src/timer/os2/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #define INCL_DOSMISC #define INCL_DOSERRORS diff --git a/src/timer/riscos/SDL_systimer.c b/src/timer/riscos/SDL_systimer.c index f6ab7cf46..4e9589a4e 100644 --- a/src/timer/riscos/SDL_systimer.c +++ b/src/timer/riscos/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c index a6cbe7df2..e3d9bf1ea 100644 --- a/src/timer/unix/SDL_systimer.c +++ b/src/timer/unix/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/win32/SDL_systimer.c index c236487c6..995e6934b 100644 --- a/src/timer/win32/SDL_systimer.c +++ b/src/timer/win32/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" #include diff --git a/src/timer/wince/SDL_systimer.c b/src/timer/wince/SDL_systimer.c index 5c39ea0a9..86cf7a393 100644 --- a/src/timer/wince/SDL_systimer.c +++ b/src/timer/wince/SDL_systimer.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" #include diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c index 95f325980..aa5d1ba9b 100644 --- a/src/video/SDL_RLEaccel.c +++ b/src/video/SDL_RLEaccel.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * RLE encoding for software colorkey and alpha-channel acceleration @@ -90,7 +91,7 @@ #include "SDL_blit.h" #include "SDL_RLEaccel_c.h" -#if (i386 || __x86_64__) && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES #define MMX_ASMBLIT #endif diff --git a/src/video/SDL_RLEaccel_c.h b/src/video/SDL_RLEaccel_c.h index a2d0b9752..ba9d35d3f 100644 --- a/src/video/SDL_RLEaccel_c.h +++ b/src/video/SDL_RLEaccel_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful functions and variables from SDL_RLEaccel.c */ diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c index eaa432d0d..d3fb7783e 100644 --- a/src/video/SDL_blit.c +++ b/src/video/SDL_blit.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_sysvideo.h" @@ -26,7 +27,7 @@ #include "SDL_RLEaccel_c.h" #include "SDL_pixels_c.h" -#if (i386 || __x86_64__) && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES #define MMX_ASMBLIT #endif diff --git a/src/video/SDL_blit.h b/src/video/SDL_blit.h index bf1e1f16f..0ef24825d 100644 --- a/src/video/SDL_blit.h +++ b/src/video/SDL_blit.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_blit_h #define _SDL_blit_h diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c index 2a7c01233..7cab3dfe4 100644 --- a/src/video/SDL_blit_0.c +++ b/src/video/SDL_blit_0.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_blit.h" diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c index 0e737c074..d31126b26 100644 --- a/src/video/SDL_blit_1.c +++ b/src/video/SDL_blit_1.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_blit.h" diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index 7b8e0b8f1..ccd7ace37 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -19,11 +19,12 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_blit.h" -#if (defined(i386) || defined(__x86_64__)) && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES #define MMX_ASMBLIT 1 #endif @@ -419,7 +420,7 @@ static void BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo *info) #endif #include -#if ((defined MACOSX) && (__GNUC__ < 4)) +#if (defined(__MACOSX__) && (__GNUC__ < 4)) #define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \ (vector unsigned char) ( a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p ) #define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \ diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index b7f2de20c..2935e5a65 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_endian.h" @@ -32,7 +33,7 @@ #include #endif #define assert(X) -#ifdef MACOSX +#ifdef __MACOSX__ #include static size_t GetL3CacheSize( void ) { @@ -52,9 +53,9 @@ static size_t GetL3CacheSize( void ) /* XXX: Just guess G4 */ return 2097152; } -#endif /* MACOSX */ +#endif /* __MACOSX__ */ -#if ((defined MACOSX) && (__GNUC__ < 4)) +#if (defined(__MACOSX__) && (__GNUC__ < 4)) #define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \ (vector unsigned char) ( a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p ) #define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \ diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c index bcd72cc2a..874cb2799 100644 --- a/src/video/SDL_bmp.c +++ b/src/video/SDL_bmp.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Code to load and save surfaces in Windows BMP format. diff --git a/src/video/SDL_cursor.c b/src/video/SDL_cursor.c index 209ba107b..429960361 100644 --- a/src/video/SDL_cursor.c +++ b/src/video/SDL_cursor.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General cursor handling code for SDL */ diff --git a/src/video/SDL_cursor_c.h b/src/video/SDL_cursor_c.h index 24022ca31..fc983e2d0 100644 --- a/src/video/SDL_cursor_c.h +++ b/src/video/SDL_cursor_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful variables and functions from SDL_cursor.c */ #include "SDL_mouse.h" diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c index 710c5aea2..8e1a3e90c 100644 --- a/src/video/SDL_gamma.c +++ b/src/video/SDL_gamma.c @@ -19,11 +19,10 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Gamma correction support */ -#include "SDL_config.h" - #ifdef HAVE_MATH_H #include /* Used for calculating gamma ramps */ #else diff --git a/src/video/SDL_leaks.h b/src/video/SDL_leaks.h index ae33fa7b4..5151646fd 100644 --- a/src/video/SDL_leaks.h +++ b/src/video/SDL_leaks.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Define this if you want surface leak detection code enabled */ /*#define CHECK_LEAKS*/ diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c index 0faf46c17..7716a7401 100644 --- a/src/video/SDL_pixels.c +++ b/src/video/SDL_pixels.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* General (mostly internal) pixel/color manipulation routines for SDL */ diff --git a/src/video/SDL_pixels_c.h b/src/video/SDL_pixels_c.h index 01af5a13e..6ab56b173 100644 --- a/src/video/SDL_pixels_c.h +++ b/src/video/SDL_pixels_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Useful functions and variables from SDL_pixel.c */ diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c index 026d1b4ea..f22c83215 100644 --- a/src/video/SDL_stretch.c +++ b/src/video/SDL_stretch.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This a stretch blit implementation based on ideas given to me by Tomasz Cejner - thanks! :) @@ -34,7 +35,7 @@ */ #if ((defined(_MFC_VER) && defined(_M_IX86)/* && !defined(_WIN32_WCE) still needed? */) || \ - (defined(i386) && defined(__GNUC__))) && SDL_ASSEMBLY_BLITTERS + (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES #define USE_ASM_STRETCH #endif diff --git a/src/video/SDL_stretch_c.h b/src/video/SDL_stretch_c.h index c6a556984..ee06b264f 100644 --- a/src/video/SDL_stretch_c.h +++ b/src/video/SDL_stretch_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Perform a stretch blit between two surfaces of the same format. NOTE: This function is not safe to call from multiple threads! diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c index 278532722..26c300ffd 100644 --- a/src/video/SDL_surface.c +++ b/src/video/SDL_surface.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_sysvideo.h" diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h index 9d406db3c..414d07c55 100644 --- a/src/video/SDL_sysvideo.h +++ b/src/video/SDL_sysvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_sysvideo_h #define _SDL_sysvideo_h @@ -32,17 +33,8 @@ This is designed to be easily converted to C++ in the future. */ -/* OpenGL is pretty much available on all Windows systems */ -#ifdef WIN32 -#include "SDL_windows.h" -#endif - #if SDL_VIDEO_OPENGL -#ifdef MACOSX -#include /* OpenGL.framework */ -#else -#include -#endif /* MACOSX */ +#include "SDL_opengl.h" #endif /* SDL_VIDEO_OPENGL */ /* The SDL video driver */ diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 20d94d018..2c64c4cef 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* The high-level video driver subsystem */ @@ -356,7 +357,7 @@ static Uint8 SDL_closest_depths[4][8] = { }; -#ifdef macintosh /* MPW optimization bug? */ +#ifdef __MACOS__ /* MPW optimization bug? */ #define NEGATIVE_ONE 0xFFFFFFFF #else #define NEGATIVE_ONE -1 diff --git a/src/video/SDL_yuv.c b/src/video/SDL_yuv.c index 5937cedd0..7c023598a 100644 --- a/src/video/SDL_yuv.c +++ b/src/video/SDL_yuv.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the implementation of the YUV video surface support */ diff --git a/src/video/SDL_yuv_mmx.c b/src/video/SDL_yuv_mmx.c index 018d24ff1..3bdad9fcb 100644 --- a/src/video/SDL_yuv_mmx.c +++ b/src/video/SDL_yuv_mmx.c @@ -19,10 +19,9 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" -#include "SDL_stdinc.h" - -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES #define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used)) diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c index 9d8141182..3f1a59dcb 100644 --- a/src/video/SDL_yuv_sw.c +++ b/src/video/SDL_yuv_sw.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the software implementation of the YUV video overlay support */ @@ -1058,7 +1059,7 @@ SDL_Overlay *SDL_CreateYUV_SW(_THIS, int width, int height, Uint32 format, SDL_S case SDL_YV12_OVERLAY: case SDL_IYUV_OVERLAY: if ( display->format->BytesPerPixel == 2 ) { -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0xF800) && (Gmask == 0x07E0) && @@ -1080,7 +1081,7 @@ SDL_Overlay *SDL_CreateYUV_SW(_THIS, int width, int height, Uint32 format, SDL_S swdata->Display2X = Color24DitherYV12Mod2X; } if ( display->format->BytesPerPixel == 4 ) { -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0x00FF0000) && (Gmask == 0x0000FF00) && diff --git a/src/video/SDL_yuv_sw_c.h b/src/video/SDL_yuv_sw_c.h index d7caf4840..327acccd0 100644 --- a/src/video/SDL_yuv_sw_c.h +++ b/src/video/SDL_yuv_sw_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_sysvideo.h" diff --git a/src/video/SDL_yuvfuncs.h b/src/video/SDL_yuvfuncs.h index 6e18562da..173909f59 100644 --- a/src/video/SDL_yuvfuncs.h +++ b/src/video/SDL_yuvfuncs.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the definition of the YUV video surface function structure */ diff --git a/src/video/aalib/SDL_aaevents.c b/src/video/aalib/SDL_aaevents.c index 5b71c7330..5ff97355a 100644 --- a/src/video/aalib/SDL_aaevents.c +++ b/src/video/aalib/SDL_aaevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting AA events into SDL events */ diff --git a/src/video/aalib/SDL_aaevents_c.h b/src/video/aalib/SDL_aaevents_c.h index 574c59965..37a1c2e30 100644 --- a/src/video/aalib/SDL_aaevents_c.h +++ b/src/video/aalib/SDL_aaevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_aavideo.h" diff --git a/src/video/aalib/SDL_aamouse.c b/src/video/aalib/SDL_aamouse.c index 59d89092d..eed197d44 100644 --- a/src/video/aalib/SDL_aamouse.c +++ b/src/video/aalib/SDL_aamouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/video/aalib/SDL_aamouse_c.h b/src/video/aalib/SDL_aamouse_c.h index 93eca9664..8e06cf2ff 100644 --- a/src/video/aalib/SDL_aamouse_c.h +++ b/src/video/aalib/SDL_aamouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_aavideo.h" diff --git a/src/video/aalib/SDL_aavideo.c b/src/video/aalib/SDL_aavideo.c index 63faf2eb0..3ec322eab 100644 --- a/src/video/aalib/SDL_aavideo.c +++ b/src/video/aalib/SDL_aavideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* AAlib based SDL video driver implementation. */ diff --git a/src/video/aalib/SDL_aavideo.h b/src/video/aalib/SDL_aavideo.h index 4ac8e7461..cd70c9f16 100644 --- a/src/video/aalib/SDL_aavideo.h +++ b/src/video/aalib/SDL_aavideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_aavideo_h #define _SDL_aavideo_h diff --git a/src/video/ataricommon/SDL_ataric2p_s.h b/src/video/ataricommon/SDL_ataric2p_s.h index 85da9517a..a8f97e2ef 100644 --- a/src/video/ataricommon/SDL_ataric2p_s.h +++ b/src/video/ataricommon/SDL_ataric2p_s.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _ATARI_C2P_h #define _ATARI_C2P_h diff --git a/src/video/ataricommon/SDL_atarieddi_s.h b/src/video/ataricommon/SDL_atarieddi_s.h index bdbc0fc8f..22031bd50 100644 --- a/src/video/ataricommon/SDL_atarieddi_s.h +++ b/src/video/ataricommon/SDL_atarieddi_s.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_Atari_eddi_s_h #define _SDL_Atari_eddi_s_h diff --git a/src/video/ataricommon/SDL_atarievents.c b/src/video/ataricommon/SDL_atarievents.c index b655d8483..66657441b 100644 --- a/src/video/ataricommon/SDL_atarievents.c +++ b/src/video/ataricommon/SDL_atarievents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager diff --git a/src/video/ataricommon/SDL_atarievents_c.h b/src/video/ataricommon/SDL_atarievents_c.h index 2301863a8..527b91c15 100644 --- a/src/video/ataricommon/SDL_atarievents_c.h +++ b/src/video/ataricommon/SDL_atarievents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager diff --git a/src/video/ataricommon/SDL_atarigl.c b/src/video/ataricommon/SDL_atarigl.c index 520690b6d..9cc8d2256 100644 --- a/src/video/ataricommon/SDL_atarigl.c +++ b/src/video/ataricommon/SDL_atarigl.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Atari OSMesa.ldg implementation of SDL OpenGL support */ diff --git a/src/video/ataricommon/SDL_atarigl_c.h b/src/video/ataricommon/SDL_atarigl_c.h index e84e28668..4626d446a 100644 --- a/src/video/ataricommon/SDL_atarigl_c.h +++ b/src/video/ataricommon/SDL_atarigl_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Atari OSMesa.ldg implementation of SDL OpenGL support */ diff --git a/src/video/ataricommon/SDL_atarimxalloc.c b/src/video/ataricommon/SDL_atarimxalloc.c index e83e71949..0e6b5aee8 100644 --- a/src/video/ataricommon/SDL_atarimxalloc.c +++ b/src/video/ataricommon/SDL_atarimxalloc.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Memory allocation diff --git a/src/video/ataricommon/SDL_atarimxalloc_c.h b/src/video/ataricommon/SDL_atarimxalloc_c.h index 127dbe6ee..32e6e1a56 100644 --- a/src/video/ataricommon/SDL_atarimxalloc_c.h +++ b/src/video/ataricommon/SDL_atarimxalloc_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Memory allocation diff --git a/src/video/ataricommon/SDL_biosevents.c b/src/video/ataricommon/SDL_biosevents.c index a211ef732..f305866b5 100644 --- a/src/video/ataricommon/SDL_biosevents.c +++ b/src/video/ataricommon/SDL_biosevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using BIOS diff --git a/src/video/ataricommon/SDL_biosevents_c.h b/src/video/ataricommon/SDL_biosevents_c.h index 021172fbc..e17ecf0f9 100644 --- a/src/video/ataricommon/SDL_biosevents_c.h +++ b/src/video/ataricommon/SDL_biosevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using BIOS diff --git a/src/video/ataricommon/SDL_gemdosevents.c b/src/video/ataricommon/SDL_gemdosevents.c index c410bcea1..cc2fbdd89 100644 --- a/src/video/ataricommon/SDL_gemdosevents.c +++ b/src/video/ataricommon/SDL_gemdosevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using Gemdos diff --git a/src/video/ataricommon/SDL_gemdosevents_c.h b/src/video/ataricommon/SDL_gemdosevents_c.h index f6ef77354..815d9d668 100644 --- a/src/video/ataricommon/SDL_gemdosevents_c.h +++ b/src/video/ataricommon/SDL_gemdosevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using Gemdos diff --git a/src/video/ataricommon/SDL_ikbdevents.c b/src/video/ataricommon/SDL_ikbdevents.c index ad1e748de..5c0b8347b 100644 --- a/src/video/ataricommon/SDL_ikbdevents.c +++ b/src/video/ataricommon/SDL_ikbdevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using hardware IKBD diff --git a/src/video/ataricommon/SDL_ikbdevents_c.h b/src/video/ataricommon/SDL_ikbdevents_c.h index af46ad7c5..48310df90 100644 --- a/src/video/ataricommon/SDL_ikbdevents_c.h +++ b/src/video/ataricommon/SDL_ikbdevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Atari keyboard events manager, using hardware IKBD diff --git a/src/video/ataricommon/SDL_ikbdinterrupt_s.h b/src/video/ataricommon/SDL_ikbdinterrupt_s.h index c3b8d8263..e3e116042 100644 --- a/src/video/ataricommon/SDL_ikbdinterrupt_s.h +++ b/src/video/ataricommon/SDL_ikbdinterrupt_s.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Mouse vector diff --git a/src/video/ataricommon/SDL_xbiosevents.c b/src/video/ataricommon/SDL_xbiosevents.c index 0dd1582fe..b744252fc 100644 --- a/src/video/ataricommon/SDL_xbiosevents.c +++ b/src/video/ataricommon/SDL_xbiosevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * XBIOS mouse & joystick vectors diff --git a/src/video/ataricommon/SDL_xbiosevents_c.h b/src/video/ataricommon/SDL_xbiosevents_c.h index 211155cda..05761bde4 100644 --- a/src/video/ataricommon/SDL_xbiosevents_c.h +++ b/src/video/ataricommon/SDL_xbiosevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Xbios mouse & joystick vectors diff --git a/src/video/ataricommon/SDL_xbiosinterrupt_s.h b/src/video/ataricommon/SDL_xbiosinterrupt_s.h index 204c2363e..ad31b9411 100644 --- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h +++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Mouse vector diff --git a/src/video/bwindow/SDL_BView.h b/src/video/bwindow/SDL_BView.h index 91d5a182d..6d2547e3d 100644 --- a/src/video/bwindow/SDL_BView.h +++ b/src/video/bwindow/SDL_BView.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_BView_h #define _SDL_BView_h diff --git a/src/video/bwindow/SDL_lowvideo.h b/src/video/bwindow/SDL_lowvideo.h index cb498e985..7af004b9c 100644 --- a/src/video/bwindow/SDL_lowvideo.h +++ b/src/video/bwindow/SDL_lowvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowvideo_h #define _SDL_lowvideo_h diff --git a/src/video/bwindow/SDL_sysevents_c.h b/src/video/bwindow/SDL_sysevents_c.h index 46b470ca5..e2ef3f563 100644 --- a/src/video/bwindow/SDL_sysevents_c.h +++ b/src/video/bwindow/SDL_sysevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/bwindow/SDL_sysmouse_c.h b/src/video/bwindow/SDL_sysmouse_c.h index 2bd2f298c..e4ee25534 100644 --- a/src/video/bwindow/SDL_sysmouse_c.h +++ b/src/video/bwindow/SDL_sysmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/bwindow/SDL_syswm_c.h b/src/video/bwindow/SDL_syswm_c.h index 3bf17c1e6..44892a8f6 100644 --- a/src/video/bwindow/SDL_syswm_c.h +++ b/src/video/bwindow/SDL_syswm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_syswm.h" #include "SDL_lowvideo.h" diff --git a/src/video/bwindow/SDL_sysyuv.h b/src/video/bwindow/SDL_sysyuv.h index cddc61b60..fa96f2ca2 100644 --- a/src/video/bwindow/SDL_sysyuv.h +++ b/src/video/bwindow/SDL_sysyuv.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_SYS_YUV_H__ diff --git a/src/video/cybergfx/SDL_amigaevents.c b/src/video/cybergfx/SDL_amigaevents.c index 280e0f570..333d0fa38 100644 --- a/src/video/cybergfx/SDL_amigaevents.c +++ b/src/video/cybergfx/SDL_amigaevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting Amiga events into SDL events */ #include "SDL.h" diff --git a/src/video/cybergfx/SDL_amigaevents_c.h b/src/video/cybergfx/SDL_amigaevents_c.h index 86ebc2e15..11b86b5e5 100644 --- a/src/video/cybergfx/SDL_amigaevents_c.h +++ b/src/video/cybergfx/SDL_amigaevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_cgxvideo.h" diff --git a/src/video/cybergfx/SDL_amigamouse.c b/src/video/cybergfx/SDL_amigamouse.c index e1428ea24..64940a82d 100644 --- a/src/video/cybergfx/SDL_amigamouse.c +++ b/src/video/cybergfx/SDL_amigamouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/cybergfx/SDL_amigamouse_c.h b/src/video/cybergfx/SDL_amigamouse_c.h index 9b72f3c9d..aad19b627 100644 --- a/src/video/cybergfx/SDL_amigamouse_c.h +++ b/src/video/cybergfx/SDL_amigamouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_cgxvideo.h" diff --git a/src/video/cybergfx/SDL_cgxaccel.c b/src/video/cybergfx/SDL_cgxaccel.c index 078f01793..24605e355 100644 --- a/src/video/cybergfx/SDL_cgxaccel.c +++ b/src/video/cybergfx/SDL_cgxaccel.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_endian.h" #include "SDL_video.h" diff --git a/src/video/cybergfx/SDL_cgxgl.c b/src/video/cybergfx/SDL_cgxgl.c index f1f441e4c..e19614b9d 100644 --- a/src/video/cybergfx/SDL_cgxgl.c +++ b/src/video/cybergfx/SDL_cgxgl.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* StormMesa implementation of SDL OpenGL support */ diff --git a/src/video/cybergfx/SDL_cgxgl_c.h b/src/video/cybergfx/SDL_cgxgl_c.h index c1dfccf11..4c04f59a5 100644 --- a/src/video/cybergfx/SDL_cgxgl_c.h +++ b/src/video/cybergfx/SDL_cgxgl_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* StormMesa implementation of SDL OpenGL support */ diff --git a/src/video/cybergfx/SDL_cgximage.c b/src/video/cybergfx/SDL_cgximage.c index 158893185..3e8938efe 100644 --- a/src/video/cybergfx/SDL_cgximage.c +++ b/src/video/cybergfx/SDL_cgximage.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_endian.h" #include "SDL_cgximage_c.h" diff --git a/src/video/cybergfx/SDL_cgximage_c.h b/src/video/cybergfx/SDL_cgximage_c.h index 54c69b06e..30dc7a413 100644 --- a/src/video/cybergfx/SDL_cgximage_c.h +++ b/src/video/cybergfx/SDL_cgximage_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_cgxvideo.h" diff --git a/src/video/cybergfx/SDL_cgxmodes.c b/src/video/cybergfx/SDL_cgxmodes.c index 1fbbf566c..fdf7dbd29 100644 --- a/src/video/cybergfx/SDL_cgxmodes.c +++ b/src/video/cybergfx/SDL_cgxmodes.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Utilities for getting and setting the X display mode */ diff --git a/src/video/cybergfx/SDL_cgxmodes_c.h b/src/video/cybergfx/SDL_cgxmodes_c.h index e52111dac..6c6f4856e 100644 --- a/src/video/cybergfx/SDL_cgxmodes_c.h +++ b/src/video/cybergfx/SDL_cgxmodes_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Utilities for getting and setting the X display mode */ diff --git a/src/video/cybergfx/SDL_cgxvideo.c b/src/video/cybergfx/SDL_cgxvideo.c index 4e443c6b2..417ab70af 100644 --- a/src/video/cybergfx/SDL_cgxvideo.c +++ b/src/video/cybergfx/SDL_cgxvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * CGX based SDL video driver implementation by Gabriele Greco diff --git a/src/video/cybergfx/SDL_cgxvideo.h b/src/video/cybergfx/SDL_cgxvideo.h index e4f5f91bc..b5ed8f129 100644 --- a/src/video/cybergfx/SDL_cgxvideo.h +++ b/src/video/cybergfx/SDL_cgxvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_cgxvideo_h #define _SDL_cgxvideo_h diff --git a/src/video/cybergfx/SDL_cgxwm.c b/src/video/cybergfx/SDL_cgxwm.c index 5ce8f3bb0..47a7d6002 100644 --- a/src/video/cybergfx/SDL_cgxwm.c +++ b/src/video/cybergfx/SDL_cgxwm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_version.h" #include "SDL_timer.h" diff --git a/src/video/cybergfx/SDL_cgxwm_c.h b/src/video/cybergfx/SDL_cgxwm_c.h index 9b98b3399..35d1a616e 100644 --- a/src/video/cybergfx/SDL_cgxwm_c.h +++ b/src/video/cybergfx/SDL_cgxwm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_cgxvideo.h" diff --git a/src/video/dc/SDL_dcevents.c b/src/video/dc/SDL_dcevents.c index 940bdbb80..c1808d2fc 100644 --- a/src/video/dc/SDL_dcevents.c +++ b/src/video/dc/SDL_dcevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL.h" #include "../../events/SDL_sysevents.h" diff --git a/src/video/dc/SDL_dcevents_c.h b/src/video/dc/SDL_dcevents_c.h index 05659d095..57dc6d603 100644 --- a/src/video/dc/SDL_dcevents_c.h +++ b/src/video/dc/SDL_dcevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_dcvideo.h" diff --git a/src/video/dc/SDL_dcmouse.c b/src/video/dc/SDL_dcmouse.c index c66992afc..ccb969d79 100644 --- a/src/video/dc/SDL_dcmouse.c +++ b/src/video/dc/SDL_dcmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/video/dc/SDL_dcmouse_c.h b/src/video/dc/SDL_dcmouse_c.h index 45193111b..e985c7593 100644 --- a/src/video/dc/SDL_dcmouse_c.h +++ b/src/video/dc/SDL_dcmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_dcvideo.h" diff --git a/src/video/dc/SDL_dcvideo.c b/src/video/dc/SDL_dcvideo.c index 9dd7d94fd..6b8b10830 100644 --- a/src/video/dc/SDL_dcvideo.c +++ b/src/video/dc/SDL_dcvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_mouse.h" diff --git a/src/video/dc/SDL_dcvideo.h b/src/video/dc/SDL_dcvideo.h index 86d53e426..2c7bf2553 100644 --- a/src/video/dc/SDL_dcvideo.h +++ b/src/video/dc/SDL_dcvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dcvideo_h #define _SDL_dcvideo_h diff --git a/src/video/dga/SDL_dgaevents.c b/src/video/dga/SDL_dgaevents.c index d81d8eada..af0abd98f 100644 --- a/src/video/dga/SDL_dgaevents.c +++ b/src/video/dga/SDL_dgaevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting DGA events into SDL events */ diff --git a/src/video/dga/SDL_dgaevents_c.h b/src/video/dga/SDL_dgaevents_c.h index 61239b4ef..15e47f73e 100644 --- a/src/video/dga/SDL_dgaevents_c.h +++ b/src/video/dga/SDL_dgaevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_dgavideo.h" diff --git a/src/video/dga/SDL_dgamouse.c b/src/video/dga/SDL_dgamouse.c index aa85b6ccf..fb995633a 100644 --- a/src/video/dga/SDL_dgamouse.c +++ b/src/video/dga/SDL_dgamouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/video/dga/SDL_dgamouse_c.h b/src/video/dga/SDL_dgamouse_c.h index 1246900c6..e863f6a4a 100644 --- a/src/video/dga/SDL_dgamouse_c.h +++ b/src/video/dga/SDL_dgamouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_dgavideo.h" diff --git a/src/video/dga/SDL_dgavideo.c b/src/video/dga/SDL_dgavideo.c index da8da94d0..055222fa2 100644 --- a/src/video/dga/SDL_dgavideo.c +++ b/src/video/dga/SDL_dgavideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* DGA 2.0 based SDL video driver implementation. */ diff --git a/src/video/dga/SDL_dgavideo.h b/src/video/dga/SDL_dgavideo.h index b7465db63..cf6695b65 100644 --- a/src/video/dga/SDL_dgavideo.h +++ b/src/video/dga/SDL_dgavideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dgavideo_h #define _SDL_dgavideo_h diff --git a/src/video/directfb/SDL_DirectFB_events.c b/src/video/directfb/SDL_DirectFB_events.c index 127df17d9..97c54c208 100644 --- a/src/video/directfb/SDL_DirectFB_events.c +++ b/src/video/directfb/SDL_DirectFB_events.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting DirectFB input events into SDL events */ diff --git a/src/video/directfb/SDL_DirectFB_events.h b/src/video/directfb/SDL_DirectFB_events.h index f3a17bae2..b4b4370b8 100644 --- a/src/video/directfb/SDL_DirectFB_events.h +++ b/src/video/directfb/SDL_DirectFB_events.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_DirectFB_video.h" diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c index 19d72ea7e..dfe22c3fb 100644 --- a/src/video/directfb/SDL_DirectFB_video.c +++ b/src/video/directfb/SDL_DirectFB_video.c @@ -23,6 +23,7 @@ CRTC2 support is inspired by mplayer's dfbmga driver written by Ville Syrj�� */ +#include "SDL_config.h" /* DirectFB video driver implementation. */ diff --git a/src/video/directfb/SDL_DirectFB_video.h b/src/video/directfb/SDL_DirectFB_video.h index 82c111cae..fd92b288e 100644 --- a/src/video/directfb/SDL_DirectFB_video.h +++ b/src/video/directfb/SDL_DirectFB_video.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_DirectFB_video_h #define _SDL_DirectFB_video_h diff --git a/src/video/directfb/SDL_DirectFB_yuv.c b/src/video/directfb/SDL_DirectFB_yuv.c index 5da94cb5f..9aa30758f 100644 --- a/src/video/directfb/SDL_DirectFB_yuv.c +++ b/src/video/directfb/SDL_DirectFB_yuv.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the DirectFB implementation of YUV video overlays */ diff --git a/src/video/directfb/SDL_DirectFB_yuv.h b/src/video/directfb/SDL_DirectFB_yuv.h index 85dde07b9..dd2b974e7 100644 --- a/src/video/directfb/SDL_DirectFB_yuv.h +++ b/src/video/directfb/SDL_DirectFB_yuv.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the DirectFB implementation of YUV video overlays */ diff --git a/src/video/dummy/SDL_nullevents.c b/src/video/dummy/SDL_nullevents.c index f22701a25..099475f60 100644 --- a/src/video/dummy/SDL_nullevents.c +++ b/src/video/dummy/SDL_nullevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Being a null driver, there's no event stream. We just define stubs for most of the API. */ diff --git a/src/video/dummy/SDL_nullevents_c.h b/src/video/dummy/SDL_nullevents_c.h index d873e6326..674c336fa 100644 --- a/src/video/dummy/SDL_nullevents_c.h +++ b/src/video/dummy/SDL_nullevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_nullvideo.h" diff --git a/src/video/dummy/SDL_nullmouse.c b/src/video/dummy/SDL_nullmouse.c index 56e15df70..19b51a7bb 100644 --- a/src/video/dummy/SDL_nullmouse.c +++ b/src/video/dummy/SDL_nullmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/dummy/SDL_nullmouse_c.h b/src/video/dummy/SDL_nullmouse_c.h index c3bee36a1..2770e676d 100644 --- a/src/video/dummy/SDL_nullmouse_c.h +++ b/src/video/dummy/SDL_nullmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_nullvideo.h" diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c index c5243e390..1fb61f5d1 100644 --- a/src/video/dummy/SDL_nullvideo.c +++ b/src/video/dummy/SDL_nullvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Dummy SDL video driver implementation; this is just enough to make an * SDL-based application THINK it's got a working video driver, for diff --git a/src/video/dummy/SDL_nullvideo.h b/src/video/dummy/SDL_nullvideo.h index db135fa71..a615ff454 100644 --- a/src/video/dummy/SDL_nullvideo.h +++ b/src/video/dummy/SDL_nullvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_nullvideo_h #define _SDL_nullvideo_h diff --git a/src/video/epoc/SDL_epocevents_c.h b/src/video/epoc/SDL_epocevents_c.h index 3714dc95d..8455c153b 100644 --- a/src/video/epoc/SDL_epocevents_c.h +++ b/src/video/epoc/SDL_epocevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_epocevents_c.h diff --git a/src/video/epoc/SDL_epocvideo.h b/src/video/epoc/SDL_epocvideo.h index 1fccc12f5..efff50a98 100644 --- a/src/video/epoc/SDL_epocvideo.h +++ b/src/video/epoc/SDL_epocvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* SDL_epocvideo.h diff --git a/src/video/fbcon/3dfx_mmio.h b/src/video/fbcon/3dfx_mmio.h index 03f881082..5a4acb96b 100644 --- a/src/video/fbcon/3dfx_mmio.h +++ b/src/video/fbcon/3dfx_mmio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* 3Dfx register definitions */ diff --git a/src/video/fbcon/3dfx_regs.h b/src/video/fbcon/3dfx_regs.h index 8354b0fdf..1180c8244 100644 --- a/src/video/fbcon/3dfx_regs.h +++ b/src/video/fbcon/3dfx_regs.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _3DFX_REGS_H #define _3DFX_REGS_H diff --git a/src/video/fbcon/SDL_fb3dfx.c b/src/video/fbcon/SDL_fb3dfx.c index ba4d77ae5..36cada54d 100644 --- a/src/video/fbcon/SDL_fb3dfx.c +++ b/src/video/fbcon/SDL_fb3dfx.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "../SDL_blit.h" diff --git a/src/video/fbcon/SDL_fb3dfx.h b/src/video/fbcon/SDL_fb3dfx.h index 0a8d08ef8..b8b4aace5 100644 --- a/src/video/fbcon/SDL_fb3dfx.h +++ b/src/video/fbcon/SDL_fb3dfx.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* 3Dfx hardware acceleration for the SDL framebuffer console driver */ diff --git a/src/video/fbcon/SDL_fbelo.c b/src/video/fbcon/SDL_fbelo.c index d9c1c4049..1142923d2 100644 --- a/src/video/fbcon/SDL_fbelo.c +++ b/src/video/fbcon/SDL_fbelo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/fbcon/SDL_fbelo.h b/src/video/fbcon/SDL_fbelo.h index c7b86248c..004664520 100644 --- a/src/video/fbcon/SDL_fbelo.h +++ b/src/video/fbcon/SDL_fbelo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef SDL_fbelo_h #define SDL_fbelo_h diff --git a/src/video/fbcon/SDL_fbevents.c b/src/video/fbcon/SDL_fbevents.c index 725b317fa..35ba01fee 100644 --- a/src/video/fbcon/SDL_fbevents.c +++ b/src/video/fbcon/SDL_fbevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting console events into SDL events */ diff --git a/src/video/fbcon/SDL_fbevents_c.h b/src/video/fbcon/SDL_fbevents_c.h index 81fb38aba..99166bda2 100644 --- a/src/video/fbcon/SDL_fbevents_c.h +++ b/src/video/fbcon/SDL_fbevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_fbvideo.h" diff --git a/src/video/fbcon/SDL_fbmatrox.c b/src/video/fbcon/SDL_fbmatrox.c index 789448860..84ea89885 100644 --- a/src/video/fbcon/SDL_fbmatrox.c +++ b/src/video/fbcon/SDL_fbmatrox.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "../SDL_blit.h" diff --git a/src/video/fbcon/SDL_fbmatrox.h b/src/video/fbcon/SDL_fbmatrox.h index 4bc53785a..1721785a6 100644 --- a/src/video/fbcon/SDL_fbmatrox.h +++ b/src/video/fbcon/SDL_fbmatrox.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Matrox hardware acceleration for the SDL framebuffer console driver */ diff --git a/src/video/fbcon/SDL_fbmouse.c b/src/video/fbcon/SDL_fbmouse.c index e4c2c87cb..d2d30cdb8 100644 --- a/src/video/fbcon/SDL_fbmouse.c +++ b/src/video/fbcon/SDL_fbmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/fbcon/SDL_fbmouse_c.h b/src/video/fbcon/SDL_fbmouse_c.h index ef646c2ac..4950f56f2 100644 --- a/src/video/fbcon/SDL_fbmouse_c.h +++ b/src/video/fbcon/SDL_fbmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_fbvideo.h" diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c index e6432db3a..9ba611bcd 100644 --- a/src/video/fbcon/SDL_fbriva.c +++ b/src/video/fbcon/SDL_fbriva.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_video.h" #include "../SDL_blit.h" diff --git a/src/video/fbcon/SDL_fbriva.h b/src/video/fbcon/SDL_fbriva.h index a7f53dacf..9ccc4707e 100644 --- a/src/video/fbcon/SDL_fbriva.h +++ b/src/video/fbcon/SDL_fbriva.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Riva hardware acceleration for the SDL framebuffer console driver */ diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c index c755b5831..4e5262ff8 100644 --- a/src/video/fbcon/SDL_fbvideo.c +++ b/src/video/fbcon/SDL_fbvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Framebuffer console based SDL video driver implementation. */ diff --git a/src/video/fbcon/SDL_fbvideo.h b/src/video/fbcon/SDL_fbvideo.h index bf74bbf54..f03b1024d 100644 --- a/src/video/fbcon/SDL_fbvideo.h +++ b/src/video/fbcon/SDL_fbvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_fbvideo_h #define _SDL_fbvideo_h diff --git a/src/video/fbcon/matrox_mmio.h b/src/video/fbcon/matrox_mmio.h index 9b8ce6cc4..99c766135 100644 --- a/src/video/fbcon/matrox_mmio.h +++ b/src/video/fbcon/matrox_mmio.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* MGA register definitions */ diff --git a/src/video/fbcon/riva_regs.h b/src/video/fbcon/riva_regs.h index 738d8ccc7..4a21c0711 100644 --- a/src/video/fbcon/riva_regs.h +++ b/src/video/fbcon/riva_regs.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _RIVA_REGS_H #define _RIVA_REGS_H diff --git a/src/video/gapi/SDL_gapivideo.c b/src/video/gapi/SDL_gapivideo.c index faad954d8..f9d8fed67 100644 --- a/src/video/gapi/SDL_gapivideo.c +++ b/src/video/gapi/SDL_gapivideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Pocket PC GAPI SDL video driver implementation; Implemented by Dmitry Yakimov - support@activekitten.com diff --git a/src/video/gapi/SDL_gapivideo.h b/src/video/gapi/SDL_gapivideo.h index d844fdec9..a0de69e5e 100644 --- a/src/video/gapi/SDL_gapivideo.h +++ b/src/video/gapi/SDL_gapivideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_gapivideo_h #define _SDL_gapivideo_h diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c index fdfe2b1d1..57202c0d6 100644 --- a/src/video/gem/SDL_gemevents.c +++ b/src/video/gem/SDL_gemevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * GEM SDL video driver implementation diff --git a/src/video/gem/SDL_gemevents_c.h b/src/video/gem/SDL_gemevents_c.h index 11cc30b79..919f86fe9 100644 --- a/src/video/gem/SDL_gemevents_c.h +++ b/src/video/gem/SDL_gemevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_gemvideo.h" diff --git a/src/video/gem/SDL_gemmouse.c b/src/video/gem/SDL_gemmouse.c index 2b965a925..f561439d8 100644 --- a/src/video/gem/SDL_gemmouse.c +++ b/src/video/gem/SDL_gemmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * GEM Mouse manager diff --git a/src/video/gem/SDL_gemmouse_c.h b/src/video/gem/SDL_gemmouse_c.h index e0a5dd72d..88028f432 100644 --- a/src/video/gem/SDL_gemmouse_c.h +++ b/src/video/gem/SDL_gemmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_gemvideo.h" diff --git a/src/video/gem/SDL_gemvideo.c b/src/video/gem/SDL_gemvideo.c index 683a377e4..8ec437fcb 100644 --- a/src/video/gem/SDL_gemvideo.c +++ b/src/video/gem/SDL_gemvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* GEM video driver diff --git a/src/video/gem/SDL_gemvideo.h b/src/video/gem/SDL_gemvideo.h index 9b91f25d7..d76d5d4b6 100644 --- a/src/video/gem/SDL_gemvideo.h +++ b/src/video/gem/SDL_gemvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_gemvideo_h #define _SDL_gemvideo_h diff --git a/src/video/gem/SDL_gemwm.c b/src/video/gem/SDL_gemwm.c index 3c7d20278..28d26443b 100644 --- a/src/video/gem/SDL_gemwm.c +++ b/src/video/gem/SDL_gemwm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* GEM SDL video driver diff --git a/src/video/gem/SDL_gemwm_c.h b/src/video/gem/SDL_gemwm_c.h index 6425664b3..a2a0b63b5 100644 --- a/src/video/gem/SDL_gemwm_c.h +++ b/src/video/gem/SDL_gemwm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * GEM SDL video driver implementation diff --git a/src/video/ggi/SDL_ggievents.c b/src/video/ggi/SDL_ggievents.c index 99bee7d68..ce8d67dfa 100644 --- a/src/video/ggi/SDL_ggievents.c +++ b/src/video/ggi/SDL_ggievents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting GGI events into SDL events */ diff --git a/src/video/ggi/SDL_ggievents_c.h b/src/video/ggi/SDL_ggievents_c.h index e4884f3a7..114b6925a 100755 --- a/src/video/ggi/SDL_ggievents_c.h +++ b/src/video/ggi/SDL_ggievents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_ggivideo.h" diff --git a/src/video/ggi/SDL_ggimouse.c b/src/video/ggi/SDL_ggimouse.c index 0936c39b9..f9f1a04ca 100644 --- a/src/video/ggi/SDL_ggimouse.c +++ b/src/video/ggi/SDL_ggimouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/ggi/SDL_ggimouse_c.h b/src/video/ggi/SDL_ggimouse_c.h index 8b3d0d882..a679d0579 100755 --- a/src/video/ggi/SDL_ggimouse_c.h +++ b/src/video/ggi/SDL_ggimouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_ggivideo.h" diff --git a/src/video/ggi/SDL_ggivideo.c b/src/video/ggi/SDL_ggivideo.c index 42456ad93..909df324e 100644 --- a/src/video/ggi/SDL_ggivideo.c +++ b/src/video/ggi/SDL_ggivideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* GGI-based SDL video driver implementation. */ diff --git a/src/video/ggi/SDL_ggivideo.h b/src/video/ggi/SDL_ggivideo.h index 8a5ce2166..9d687041a 100644 --- a/src/video/ggi/SDL_ggivideo.h +++ b/src/video/ggi/SDL_ggivideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_ggivideo_h #define _SDL_ggivideo_h diff --git a/src/video/ipod/SDL_ipodvideo.c b/src/video/ipod/SDL_ipodvideo.c index a3f26a869..ce3dad380 100644 --- a/src/video/ipod/SDL_ipodvideo.c +++ b/src/video/ipod/SDL_ipodvideo.c @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + #include #include diff --git a/src/video/ipod/SDL_ipodvideo.h b/src/video/ipod/SDL_ipodvideo.h index ea3bd6ce7..a704f411c 100644 --- a/src/video/ipod/SDL_ipodvideo.h +++ b/src/video/ipod/SDL_ipodvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* iPod SDL framebuffer driver * Joshua Oreman diff --git a/src/video/maccommon/SDL_lowvideo.h b/src/video/maccommon/SDL_lowvideo.h index d3f985be5..d902c6e66 100644 --- a/src/video/maccommon/SDL_lowvideo.h +++ b/src/video/maccommon/SDL_lowvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowvideo_h #define _SDL_lowvideo_h @@ -35,14 +36,8 @@ #endif #if SDL_VIDEO_OPENGL -#ifdef MACOSX -#include /* OpenGL.framework */ -#include /* AGL.framework */ -#else -#include -#include -#endif /* MACOSX */ -#endif /* SDL_VIDEO_OPENGL */ +#include "SDL_opengl.h" +#endif #include "SDL_video.h" #include "../SDL_sysvideo.h" diff --git a/src/video/maccommon/SDL_macevents.c b/src/video/maccommon/SDL_macevents.c index b0ee14668..5f5b4f416 100644 --- a/src/video/maccommon/SDL_macevents.c +++ b/src/video/maccommon/SDL_macevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/video/maccommon/SDL_macevents_c.h b/src/video/maccommon/SDL_macevents_c.h index 032d70e6d..32bd1fa04 100644 --- a/src/video/maccommon/SDL_macevents_c.h +++ b/src/video/maccommon/SDL_macevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_romvideo.h" diff --git a/src/video/maccommon/SDL_macgl.c b/src/video/maccommon/SDL_macgl.c index 1eaa32610..478b5d0c2 100644 --- a/src/video/maccommon/SDL_macgl.c +++ b/src/video/maccommon/SDL_macgl.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* AGL implementation of SDL OpenGL support */ diff --git a/src/video/maccommon/SDL_macgl_c.h b/src/video/maccommon/SDL_macgl_c.h index a53938565..1ac470bbf 100644 --- a/src/video/maccommon/SDL_macgl_c.h +++ b/src/video/maccommon/SDL_macgl_c.h @@ -22,15 +22,11 @@ /* AGL implementation of SDL OpenGL support */ +#include "SDL_config.h" + #if SDL_VIDEO_OPENGL -#ifdef MACOSX -#include /* OpenGL.framework */ -#include /* AGL.framework */ -#else -#include -#include -#endif /* MACOSX */ -#endif /* SDL_VIDEO_OPENGL */ +#include "SDL_opengl.h" +#endif /* OpenGL functions */ extern int Mac_GL_Init(_THIS); diff --git a/src/video/maccommon/SDL_macmouse.c b/src/video/maccommon/SDL_macmouse.c index 929283309..85c3a0e7b 100644 --- a/src/video/maccommon/SDL_macmouse.c +++ b/src/video/maccommon/SDL_macmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if defined(__APPLE__) && defined(__MACH__) #include diff --git a/src/video/maccommon/SDL_macmouse_c.h b/src/video/maccommon/SDL_macmouse_c.h index 8e8f7ae66..12df7be38 100644 --- a/src/video/maccommon/SDL_macmouse_c.h +++ b/src/video/maccommon/SDL_macmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_romvideo.h" diff --git a/src/video/maccommon/SDL_macwm.c b/src/video/maccommon/SDL_macwm.c index 28402bad5..667774467 100644 --- a/src/video/maccommon/SDL_macwm.c +++ b/src/video/maccommon/SDL_macwm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if defined(__APPLE__) && defined(__MACH__) #include diff --git a/src/video/maccommon/SDL_macwm_c.h b/src/video/maccommon/SDL_macwm_c.h index 10ef538be..35ea2c037 100644 --- a/src/video/maccommon/SDL_macwm_c.h +++ b/src/video/maccommon/SDL_macwm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_romvideo.h" diff --git a/src/video/macdsp/SDL_dspvideo.c b/src/video/macdsp/SDL_dspvideo.c index 41d0c0f76..bd1c0672a 100644 --- a/src/video/macdsp/SDL_dspvideo.c +++ b/src/video/macdsp/SDL_dspvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Written by Darrell Walisser diff --git a/src/video/macdsp/SDL_dspvideo.h b/src/video/macdsp/SDL_dspvideo.h index 9d69acade..2a786f885 100644 --- a/src/video/macdsp/SDL_dspvideo.h +++ b/src/video/macdsp/SDL_dspvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dspvideo_h #define _SDL_dspvideo_h diff --git a/src/video/macrom/SDL_romvideo.c b/src/video/macrom/SDL_romvideo.c index 27d159fa1..6a58fe1ef 100644 --- a/src/video/macrom/SDL_romvideo.c +++ b/src/video/macrom/SDL_romvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if defined(__APPLE__) && defined(__MACH__) #include @@ -498,7 +499,7 @@ static SDL_Surface *ROM_SetVideoMode(_THIS, SDL_Surface *current, (SDL_modelist[0]->w-width)/2, (SDL_modelist[0]->h-height)/2); } -#if MACOSX && !USE_QUICKTIME +#if defined(__MACOSX__) && !USE_QUICKTIME /* Hum.. fullscreen mode is broken */ flags &= ~SDL_FULLSCREEN; #endif diff --git a/src/video/macrom/SDL_romvideo.h b/src/video/macrom/SDL_romvideo.h index 43d99f8bf..12e616c8d 100644 --- a/src/video/macrom/SDL_romvideo.h +++ b/src/video/macrom/SDL_romvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_romvideo_h #define _SDL_romvideo_h diff --git a/src/video/nanox/SDL_nxevents.c b/src/video/nanox/SDL_nxevents.c index 1e4a6e230..fb1980d5d 100644 --- a/src/video/nanox/SDL_nxevents.c +++ b/src/video/nanox/SDL_nxevents.c @@ -24,6 +24,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_keysym.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/nanox/SDL_nxevents_c.h b/src/video/nanox/SDL_nxevents_c.h index d8b1b4d97..ba12c21c5 100644 --- a/src/video/nanox/SDL_nxevents_c.h +++ b/src/video/nanox/SDL_nxevents_c.h @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_nxvideo.h" diff --git a/src/video/nanox/SDL_nximage.c b/src/video/nanox/SDL_nximage.c index 9871f57c4..6afe3b957 100644 --- a/src/video/nanox/SDL_nximage.c +++ b/src/video/nanox/SDL_nximage.c @@ -24,6 +24,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_nximage_c.h" diff --git a/src/video/nanox/SDL_nximage_c.h b/src/video/nanox/SDL_nximage_c.h index 24a1128e2..2cdc01fac 100644 --- a/src/video/nanox/SDL_nximage_c.h +++ b/src/video/nanox/SDL_nximage_c.h @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_nxvideo.h" diff --git a/src/video/nanox/SDL_nxmodes.c b/src/video/nanox/SDL_nxmodes.c index 3e7febe85..bc597e29a 100644 --- a/src/video/nanox/SDL_nxmodes.c +++ b/src/video/nanox/SDL_nxmodes.c @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_stdinc.h" #include "SDL_nxmodes_c.h" diff --git a/src/video/nanox/SDL_nxmodes_c.h b/src/video/nanox/SDL_nxmodes_c.h index e21d18186..d643ad701 100644 --- a/src/video/nanox/SDL_nxmodes_c.h +++ b/src/video/nanox/SDL_nxmodes_c.h @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_nxvideo.h" #include diff --git a/src/video/nanox/SDL_nxmouse.c b/src/video/nanox/SDL_nxmouse.c index db4f5e232..54017b192 100644 --- a/src/video/nanox/SDL_nxmouse.c +++ b/src/video/nanox/SDL_nxmouse.c @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/nanox/SDL_nxmouse_c.h b/src/video/nanox/SDL_nxmouse_c.h index 4af86b0bd..819eedbae 100644 --- a/src/video/nanox/SDL_nxmouse_c.h +++ b/src/video/nanox/SDL_nxmouse_c.h @@ -1,3 +1,26 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + #include "SDL_nxvideo.h" extern WMcursor * NX_CreateWMCursor (_THIS, Uint8 * data, Uint8 * mask, int w, int h, int hot_x, int hot_y) ; diff --git a/src/video/nanox/SDL_nxvideo.c b/src/video/nanox/SDL_nxvideo.c index 1df3fb8ce..d52b84e9d 100644 --- a/src/video/nanox/SDL_nxvideo.c +++ b/src/video/nanox/SDL_nxvideo.c @@ -24,6 +24,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_thread.h" #include "SDL_video.h" diff --git a/src/video/nanox/SDL_nxvideo.h b/src/video/nanox/SDL_nxvideo.h index e55566a2e..4e5fa277f 100644 --- a/src/video/nanox/SDL_nxvideo.h +++ b/src/video/nanox/SDL_nxvideo.h @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #ifndef _SDL_nxvideo_h #define _SDL_nxvideo_h diff --git a/src/video/nanox/SDL_nxwm.c b/src/video/nanox/SDL_nxwm.c index 2438856c4..d0af3bfbd 100644 --- a/src/video/nanox/SDL_nxwm.c +++ b/src/video/nanox/SDL_nxwm.c @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_syswm.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/nanox/SDL_nxwm_c.h b/src/video/nanox/SDL_nxwm_c.h index a4cbe0e45..459cec888 100644 --- a/src/video/nanox/SDL_nxwm_c.h +++ b/src/video/nanox/SDL_nxwm_c.h @@ -23,6 +23,7 @@ Hsieh-Fu Tsai clare@setabox.com */ +#include "SDL_config.h" #include "SDL_nxvideo.h" diff --git a/src/video/os2fslib/SDL_os2fslib.c b/src/video/os2fslib/SDL_os2fslib.c index 89f06e398..f360ae8a9 100644 --- a/src/video/os2fslib/SDL_os2fslib.c +++ b/src/video/os2fslib/SDL_os2fslib.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/os2fslib/SDL_os2fslib.h b/src/video/os2fslib/SDL_os2fslib.h index 86c1878b8..b19a83d24 100644 --- a/src/video/os2fslib/SDL_os2fslib.h +++ b/src/video/os2fslib/SDL_os2fslib.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_os2fslib_h #define _SDL_os2fslib_h diff --git a/src/video/photon/SDL_ph_events.c b/src/video/photon/SDL_ph_events.c index 8c2988a1e..7fa67a530 100644 --- a/src/video/photon/SDL_ph_events.c +++ b/src/video/photon/SDL_ph_events.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting photon events into SDL events */ diff --git a/src/video/photon/SDL_ph_events_c.h b/src/video/photon/SDL_ph_events_c.h index 9ec27826d..04152fe50 100644 --- a/src/video/photon/SDL_ph_events_c.h +++ b/src/video/photon/SDL_ph_events_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_EVENTS_H__ #define __SDL_PH_EVENTS_H__ diff --git a/src/video/photon/SDL_ph_gl.c b/src/video/photon/SDL_ph_gl.c index 0cd412040..97e16d2b9 100644 --- a/src/video/photon/SDL_ph_gl.c +++ b/src/video/photon/SDL_ph_gl.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include "SDL.h" diff --git a/src/video/photon/SDL_ph_gl.h b/src/video/photon/SDL_ph_gl.h index 50d043974..d749bd89a 100644 --- a/src/video/photon/SDL_ph_gl.h +++ b/src/video/photon/SDL_ph_gl.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_GL_H__ #define __SDL_PH_GL_H__ diff --git a/src/video/photon/SDL_ph_image.c b/src/video/photon/SDL_ph_image.c index d50a90505..199ad9ef1 100644 --- a/src/video/photon/SDL_ph_image.c +++ b/src/video/photon/SDL_ph_image.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/photon/SDL_ph_image_c.h b/src/video/photon/SDL_ph_image_c.h index f38ded7ce..7cb063cc8 100644 --- a/src/video/photon/SDL_ph_image_c.h +++ b/src/video/photon/SDL_ph_image_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_IMAGE_H__ #define __SDL_PH_IMAGE_H__ diff --git a/src/video/photon/SDL_ph_modes.c b/src/video/photon/SDL_ph_modes.c index 2ae25a0c5..2e6f12810 100644 --- a/src/video/photon/SDL_ph_modes.c +++ b/src/video/photon/SDL_ph_modes.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_ph_modes_c.h" diff --git a/src/video/photon/SDL_ph_modes_c.h b/src/video/photon/SDL_ph_modes_c.h index cf624e910..86e494cf7 100644 --- a/src/video/photon/SDL_ph_modes_c.h +++ b/src/video/photon/SDL_ph_modes_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_MODES_H__ #define __SDL_PH_MODES_H__ diff --git a/src/video/photon/SDL_ph_mouse.c b/src/video/photon/SDL_ph_mouse.c index 0c9ac5f7f..e0868bc8e 100644 --- a/src/video/photon/SDL_ph_mouse.c +++ b/src/video/photon/SDL_ph_mouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/photon/SDL_ph_mouse_c.h b/src/video/photon/SDL_ph_mouse_c.h index d7e9b7f1c..e54ff1d8e 100644 --- a/src/video/photon/SDL_ph_mouse_c.h +++ b/src/video/photon/SDL_ph_mouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_MOUSE_H__ #define __SDL_PH_MOUSE_H__ diff --git a/src/video/photon/SDL_ph_video.c b/src/video/photon/SDL_ph_video.c index 49dd10db4..ef3018646 100644 --- a/src/video/photon/SDL_ph_video.c +++ b/src/video/photon/SDL_ph_video.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/photon/SDL_ph_video.h b/src/video/photon/SDL_ph_video.h index ed389173a..4dcf3c701 100644 --- a/src/video/photon/SDL_ph_video.h +++ b/src/video/photon/SDL_ph_video.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_VIDEO_H__ #define __SDL_PH_VIDEO_H__ diff --git a/src/video/photon/SDL_ph_wm.c b/src/video/photon/SDL_ph_wm.c index a3bcc7f35..dd714982f 100644 --- a/src/video/photon/SDL_ph_wm.c +++ b/src/video/photon/SDL_ph_wm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/photon/SDL_ph_wm_c.h b/src/video/photon/SDL_ph_wm_c.h index 5de35d874..2122d239f 100644 --- a/src/video/photon/SDL_ph_wm_c.h +++ b/src/video/photon/SDL_ph_wm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef __SDL_PH_WM_H__ #define __SDL_PH_WM_H__ diff --git a/src/video/photon/SDL_phyuv.c b/src/video/photon/SDL_phyuv.c index 87e7f434b..35a4bd4ec 100644 --- a/src/video/photon/SDL_phyuv.c +++ b/src/video/photon/SDL_phyuv.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the QNX Realtime Platform version of SDL YUV video overlays */ diff --git a/src/video/photon/SDL_phyuv_c.h b/src/video/photon/SDL_phyuv_c.h index 28c296c20..e889eee8f 100644 --- a/src/video/photon/SDL_phyuv_c.h +++ b/src/video/photon/SDL_phyuv_c.h @@ -19,7 +19,7 @@ Sam Lantinga slouken@libsdl.org */ - +#include "SDL_config.h" #ifndef __SDL_PH_YUV_H__ #define __SDL_PH_YUV_H__ diff --git a/src/video/picogui/SDL_pgevents.c b/src/video/picogui/SDL_pgevents.c index 998068544..0d6b530b2 100644 --- a/src/video/picogui/SDL_pgevents.c +++ b/src/video/picogui/SDL_pgevents.c @@ -22,6 +22,7 @@ Micah Dowty micahjd@users.sourceforge.net */ +#include "SDL_config.h" #include "SDL.h" #include "../../events/SDL_sysevents.h" diff --git a/src/video/picogui/SDL_pgevents_c.h b/src/video/picogui/SDL_pgevents_c.h index e1beab071..2b7124f7d 100644 --- a/src/video/picogui/SDL_pgevents_c.h +++ b/src/video/picogui/SDL_pgevents_c.h @@ -22,6 +22,7 @@ Micah Dowty micahjd@users.sourceforge.net */ +#include "SDL_config.h" #include "SDL_pgvideo.h" diff --git a/src/video/picogui/SDL_pgvideo.c b/src/video/picogui/SDL_pgvideo.c index b14025c7e..b4b2087e9 100644 --- a/src/video/picogui/SDL_pgvideo.c +++ b/src/video/picogui/SDL_pgvideo.c @@ -22,6 +22,7 @@ Micah Dowty micahjd@users.sourceforge.net */ +#include "SDL_config.h" #include "SDL_video.h" #include "SDL_mouse.h" diff --git a/src/video/picogui/SDL_pgvideo.h b/src/video/picogui/SDL_pgvideo.h index f5113d8f5..f3d0e1d98 100644 --- a/src/video/picogui/SDL_pgvideo.h +++ b/src/video/picogui/SDL_pgvideo.h @@ -22,6 +22,7 @@ Micah Dowty micahjd@users.sourceforge.net */ +#include "SDL_config.h" #ifndef _SDL_pgvideo_h #define _SDL_pgvideo_h diff --git a/src/video/ps2gs/SDL_gsevents.c b/src/video/ps2gs/SDL_gsevents.c index 98cb92e11..13f96b5d2 100644 --- a/src/video/ps2gs/SDL_gsevents.c +++ b/src/video/ps2gs/SDL_gsevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting console events into SDL events */ diff --git a/src/video/ps2gs/SDL_gsevents_c.h b/src/video/ps2gs/SDL_gsevents_c.h index 750b1d98a..515294a5d 100644 --- a/src/video/ps2gs/SDL_gsevents_c.h +++ b/src/video/ps2gs/SDL_gsevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_gsvideo.h" diff --git a/src/video/ps2gs/SDL_gsmouse.c b/src/video/ps2gs/SDL_gsmouse.c index 364d86239..50da17911 100644 --- a/src/video/ps2gs/SDL_gsmouse.c +++ b/src/video/ps2gs/SDL_gsmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include diff --git a/src/video/ps2gs/SDL_gsmouse_c.h b/src/video/ps2gs/SDL_gsmouse_c.h index d785d3035..72616a4b0 100644 --- a/src/video/ps2gs/SDL_gsmouse_c.h +++ b/src/video/ps2gs/SDL_gsmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_gsvideo.h" diff --git a/src/video/ps2gs/SDL_gsvideo.c b/src/video/ps2gs/SDL_gsvideo.c index 2d1b251aa..e0f5b1612 100644 --- a/src/video/ps2gs/SDL_gsvideo.c +++ b/src/video/ps2gs/SDL_gsvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Framebuffer console based SDL video driver implementation. */ diff --git a/src/video/ps2gs/SDL_gsvideo.h b/src/video/ps2gs/SDL_gsvideo.h index 13715013d..e81131189 100644 --- a/src/video/ps2gs/SDL_gsvideo.h +++ b/src/video/ps2gs/SDL_gsvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_gsvideo_h #define _SDL_gsvideo_h diff --git a/src/video/ps2gs/SDL_gsyuv.c b/src/video/ps2gs/SDL_gsyuv.c index 33c71889b..0750fd2f1 100644 --- a/src/video/ps2gs/SDL_gsyuv.c +++ b/src/video/ps2gs/SDL_gsyuv.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the Playstation 2 implementation of YUV video overlays */ diff --git a/src/video/ps2gs/SDL_gsyuv_c.h b/src/video/ps2gs/SDL_gsyuv_c.h index 843d0a7ab..9adeb6318 100644 --- a/src/video/ps2gs/SDL_gsyuv_c.h +++ b/src/video/ps2gs/SDL_gsyuv_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the Playstation 2 implementation of YUV video overlays */ diff --git a/src/video/qtopia/SDL_QPEApp.h b/src/video/qtopia/SDL_QPEApp.h index 3f83c19cc..1011ad948 100644 --- a/src/video/qtopia/SDL_QPEApp.h +++ b/src/video/qtopia/SDL_QPEApp.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the QPE application loop */ diff --git a/src/video/qtopia/SDL_QWin.h b/src/video/qtopia/SDL_QWin.h index 8d5e7e099..47636dfe4 100644 --- a/src/video/qtopia/SDL_QWin.h +++ b/src/video/qtopia/SDL_QWin.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_QWin_h #define _SDL_QWin_h diff --git a/src/video/qtopia/SDL_lowvideo.h b/src/video/qtopia/SDL_lowvideo.h index 032cd2fb1..c3c09a0b4 100644 --- a/src/video/qtopia/SDL_lowvideo.h +++ b/src/video/qtopia/SDL_lowvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowvideo_h #define _SDL_lowvideo_h diff --git a/src/video/qtopia/SDL_sysevents_c.h b/src/video/qtopia/SDL_sysevents_c.h index 5ea3d362f..44576e4a0 100644 --- a/src/video/qtopia/SDL_sysevents_c.h +++ b/src/video/qtopia/SDL_sysevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/qtopia/SDL_sysmouse_c.h b/src/video/qtopia/SDL_sysmouse_c.h index 23ff5b4e6..73202fca8 100644 --- a/src/video/qtopia/SDL_sysmouse_c.h +++ b/src/video/qtopia/SDL_sysmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/qtopia/SDL_syswm_c.h b/src/video/qtopia/SDL_syswm_c.h index 439b0bca3..031269fe1 100644 --- a/src/video/qtopia/SDL_syswm_c.h +++ b/src/video/qtopia/SDL_syswm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/quartz/CGS.h b/src/video/quartz/CGS.h index 223918c88..234ff771c 100644 --- a/src/video/quartz/CGS.h +++ b/src/video/quartz/CGS.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Obscuring code: maximum number of windows above ours (inclusive) diff --git a/src/video/quartz/SDL_QuartzKeys.h b/src/video/quartz/SDL_QuartzKeys.h index c007c994d..1c07ce072 100644 --- a/src/video/quartz/SDL_QuartzKeys.h +++ b/src/video/quartz/SDL_QuartzKeys.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* These are the Macintosh key scancode constants -- from Inside Macintosh */ diff --git a/src/video/quartz/SDL_QuartzVideo.h b/src/video/quartz/SDL_QuartzVideo.h index 4c0b2de71..4352260a7 100644 --- a/src/video/quartz/SDL_QuartzVideo.h +++ b/src/video/quartz/SDL_QuartzVideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* @file SDL_QuartzVideo.h diff --git a/src/video/quartz/SDL_QuartzWindow.h b/src/video/quartz/SDL_QuartzWindow.h index f90c579f4..20077ee89 100644 --- a/src/video/quartz/SDL_QuartzWindow.h +++ b/src/video/quartz/SDL_QuartzWindow.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Subclass of NSWindow to fix genie effect and support resize events */ @interface SDL_QuartzWindow : NSWindow diff --git a/src/video/riscos/SDL_riscosFullScreenVideo.c b/src/video/riscos/SDL_riscosFullScreenVideo.c index 472781285..36047386d 100644 --- a/src/video/riscos/SDL_riscosFullScreenVideo.c +++ b/src/video/riscos/SDL_riscosFullScreenVideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_riscosevents.c b/src/video/riscos/SDL_riscosevents.c index 1ab39237a..83bcd44c8 100644 --- a/src/video/riscos/SDL_riscosevents.c +++ b/src/video/riscos/SDL_riscosevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_riscosevents_c.h b/src/video/riscos/SDL_riscosevents_c.h index 0fc24168f..87cbf5b2c 100644 --- a/src/video/riscos/SDL_riscosevents_c.h +++ b/src/video/riscos/SDL_riscosevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_riscosvideo.h" diff --git a/src/video/riscos/SDL_riscosmouse.c b/src/video/riscos/SDL_riscosmouse.c index 705d57cb7..9f364a355 100644 --- a/src/video/riscos/SDL_riscosmouse.c +++ b/src/video/riscos/SDL_riscosmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_riscosmouse_c.h b/src/video/riscos/SDL_riscosmouse_c.h index cf60db852..eff31a187 100644 --- a/src/video/riscos/SDL_riscosmouse_c.h +++ b/src/video/riscos/SDL_riscosmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_riscosvideo.h" diff --git a/src/video/riscos/SDL_riscossprite.c b/src/video/riscos/SDL_riscossprite.c index bfbc391d7..0f267ff64 100644 --- a/src/video/riscos/SDL_riscossprite.c +++ b/src/video/riscos/SDL_riscossprite.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_riscostask.c b/src/video/riscos/SDL_riscostask.c index a308bca4b..8d143e723 100644 --- a/src/video/riscos/SDL_riscostask.c +++ b/src/video/riscos/SDL_riscostask.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This file added by Alan Buckley (alan_baa@hotmail.com) to support RISC OS diff --git a/src/video/riscos/SDL_riscostask.h b/src/video/riscos/SDL_riscostask.h index b79557d6e..96db8a2a8 100644 --- a/src/video/riscos/SDL_riscostask.h +++ b/src/video/riscos/SDL_riscostask.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This file added by Alan Buckley (alan_baa@hotmail.com) to support RISC OS diff --git a/src/video/riscos/SDL_riscosvideo.c b/src/video/riscos/SDL_riscosvideo.c index 884f31d30..3c50daff3 100644 --- a/src/video/riscos/SDL_riscosvideo.c +++ b/src/video/riscos/SDL_riscosvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_riscosvideo.h b/src/video/riscos/SDL_riscosvideo.h index f9710a7df..cc3077f44 100644 --- a/src/video/riscos/SDL_riscosvideo.h +++ b/src/video/riscos/SDL_riscosvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_riscosvideo_h #define _SDL_riscosvideo_h diff --git a/src/video/riscos/SDL_wimppoll.c b/src/video/riscos/SDL_wimppoll.c index b7bd3e549..057aaccf8 100644 --- a/src/video/riscos/SDL_wimppoll.c +++ b/src/video/riscos/SDL_wimppoll.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/riscos/SDL_wimpvideo.c b/src/video/riscos/SDL_wimpvideo.c index 99d7f6be4..6286844dc 100644 --- a/src/video/riscos/SDL_wimpvideo.c +++ b/src/video/riscos/SDL_wimpvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability diff --git a/src/video/svga/SDL_svgaevents.c b/src/video/svga/SDL_svgaevents.c index 43f1f17ff..f34485640 100644 --- a/src/video/svga/SDL_svgaevents.c +++ b/src/video/svga/SDL_svgaevents.c @@ -19,16 +19,17 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting X11 events into SDL events */ #include #include #include -#if defined(linux) +#if defined(__LINUX__) #include #include -#elif defined(__FreeBSD__) +#elif defined(__FREEBSD__) #include #else #error You must choose your operating system here @@ -43,7 +44,7 @@ #if defined(linux) #define NUM_VGAKEYMAPS (1< #include -#if defined(linux) +#if defined(__LINUX__) #include -#elif defined(__FreeBSD__) +#elif defined(__FREEBSD__) #include #else #error You must choose your operating system here diff --git a/src/video/svga/SDL_svgavideo.h b/src/video/svga/SDL_svgavideo.h index d9afc89bc..74f9d8000 100644 --- a/src/video/svga/SDL_svgavideo.h +++ b/src/video/svga/SDL_svgavideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_svgavideo_h #define _SDL_svgavideo_h diff --git a/src/video/vgl/SDL_vglevents.c b/src/video/vgl/SDL_vglevents.c index 76d606194..7efbe2a87 100644 --- a/src/video/vgl/SDL_vglevents.c +++ b/src/video/vgl/SDL_vglevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting X11 events into SDL events */ diff --git a/src/video/vgl/SDL_vglevents_c.h b/src/video/vgl/SDL_vglevents_c.h index 7ca79a31c..be1c907d8 100644 --- a/src/video/vgl/SDL_vglevents_c.h +++ b/src/video/vgl/SDL_vglevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_vglvideo.h" diff --git a/src/video/vgl/SDL_vglmouse.c b/src/video/vgl/SDL_vglmouse.c index d9d493408..ab8edd213 100644 --- a/src/video/vgl/SDL_vglmouse.c +++ b/src/video/vgl/SDL_vglmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/vgl/SDL_vglmouse_c.h b/src/video/vgl/SDL_vglmouse_c.h index 457669bb0..91e010b90 100644 --- a/src/video/vgl/SDL_vglmouse_c.h +++ b/src/video/vgl/SDL_vglmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_vglvideo.h" diff --git a/src/video/vgl/SDL_vglvideo.c b/src/video/vgl/SDL_vglvideo.c index dfe6cc6c9..3047f90f2 100644 --- a/src/video/vgl/SDL_vglvideo.c +++ b/src/video/vgl/SDL_vglvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* libvga based SDL video driver implementation. */ @@ -548,7 +549,7 @@ VGLListModes(int depth, int mem_model) case V_INFO_MM_VGAX: vminfop->Type = VIDBUF8X; break; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000 +#if defined(__FREEBSD__) && __FreeBSD_version >= 500000 case V_INFO_MM_DIRECT: vminfop->PixelBytes = minfo.vi_pixel_size; switch (vminfop->PixelBytes) { diff --git a/src/video/vgl/SDL_vglvideo.h b/src/video/vgl/SDL_vglvideo.h index e909fa162..ba5380303 100644 --- a/src/video/vgl/SDL_vglvideo.h +++ b/src/video/vgl/SDL_vglvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_vglvideo_h #define _SDL_vglvideo_h diff --git a/src/video/wincommon/SDL_lowvideo.h b/src/video/wincommon/SDL_lowvideo.h index e6040983c..dbe3ef00c 100644 --- a/src/video/wincommon/SDL_lowvideo.h +++ b/src/video/wincommon/SDL_lowvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_lowvideo_h #define _SDL_lowvideo_h diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c index 8b80709f1..25f29aa52 100644 --- a/src/video/wincommon/SDL_sysevents.c +++ b/src/video/wincommon/SDL_sysevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/video/wincommon/SDL_sysmouse.c b/src/video/wincommon/SDL_sysmouse.c index d67472821..24ccb0107 100644 --- a/src/video/wincommon/SDL_sysmouse.c +++ b/src/video/wincommon/SDL_sysmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/video/wincommon/SDL_sysmouse_c.h b/src/video/wincommon/SDL_sysmouse_c.h index d5c7181bb..7afeeef68 100644 --- a/src/video/wincommon/SDL_sysmouse_c.h +++ b/src/video/wincommon/SDL_sysmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/wincommon/SDL_syswm.c b/src/video/wincommon/SDL_syswm.c index 95bd948fe..4cc085c69 100644 --- a/src/video/wincommon/SDL_syswm.c +++ b/src/video/wincommon/SDL_syswm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/video/wincommon/SDL_syswm_c.h b/src/video/wincommon/SDL_syswm_c.h index 1bc38f8ed..d245e7fd1 100644 --- a/src/video/wincommon/SDL_syswm_c.h +++ b/src/video/wincommon/SDL_syswm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_lowvideo.h" diff --git a/src/video/wincommon/SDL_wingl.c b/src/video/wincommon/SDL_wingl.c index 67cca845f..2efb69821 100644 --- a/src/video/wincommon/SDL_wingl.c +++ b/src/video/wincommon/SDL_wingl.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* WGL implementation of SDL OpenGL support */ diff --git a/src/video/wincommon/SDL_wingl_c.h b/src/video/wincommon/SDL_wingl_c.h index 8b0ebb023..795b7981d 100644 --- a/src/video/wincommon/SDL_wingl_c.h +++ b/src/video/wincommon/SDL_wingl_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* WGL implementation of SDL OpenGL support */ diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c index b8e6d73a9..03f410b85 100644 --- a/src/video/windib/SDL_dibevents.c +++ b/src/video/windib/SDL_dibevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/video/windib/SDL_dibevents_c.h b/src/video/windib/SDL_dibevents_c.h index 4de1d8571..a5b3a25af 100644 --- a/src/video/windib/SDL_dibevents_c.h +++ b/src/video/windib/SDL_dibevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "../wincommon/SDL_lowvideo.h" diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c index c9f706835..672c46826 100644 --- a/src/video/windib/SDL_dibvideo.c +++ b/src/video/windib/SDL_dibvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_windows.h" diff --git a/src/video/windib/SDL_dibvideo.h b/src/video/windib/SDL_dibvideo.h index 4b6e2049d..7a02b8611 100644 --- a/src/video/windib/SDL_dibvideo.h +++ b/src/video/windib/SDL_dibvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dibvideo_h #define _SDL_dibvideo_h diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index 1351b372a..659577014 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* CAUTION!!!! If you modify this file, check ../windib/SDL_sysevents.c */ diff --git a/src/video/windx5/SDL_dx5events_c.h b/src/video/windx5/SDL_dx5events_c.h index bb3efcd97..6575af1d9 100644 --- a/src/video/windx5/SDL_dx5events_c.h +++ b/src/video/windx5/SDL_dx5events_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "../wincommon/SDL_lowvideo.h" diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c index 12946135f..94b73a8a4 100644 --- a/src/video/windx5/SDL_dx5video.c +++ b/src/video/windx5/SDL_dx5video.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "directx.h" diff --git a/src/video/windx5/SDL_dx5video.h b/src/video/windx5/SDL_dx5video.h index 7f458fb76..35c7369b4 100644 --- a/src/video/windx5/SDL_dx5video.h +++ b/src/video/windx5/SDL_dx5video.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_dx5video_h #define _SDL_dx5video_h diff --git a/src/video/windx5/SDL_dx5yuv.c b/src/video/windx5/SDL_dx5yuv.c index 6789926d8..e250cd628 100644 --- a/src/video/windx5/SDL_dx5yuv.c +++ b/src/video/windx5/SDL_dx5yuv.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the DirectDraw implementation of YUV video overlays */ diff --git a/src/video/windx5/SDL_dx5yuv_c.h b/src/video/windx5/SDL_dx5yuv_c.h index 27fe455d2..faf5507a4 100644 --- a/src/video/windx5/SDL_dx5yuv_c.h +++ b/src/video/windx5/SDL_dx5yuv_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the DirectDraw implementation of YUV video overlays */ diff --git a/src/video/wscons/SDL_wsconsevents.c b/src/video/wscons/SDL_wsconsevents.c index 510348d14..96565c3d9 100644 --- a/src/video/wscons/SDL_wsconsevents.c +++ b/src/video/wscons/SDL_wsconsevents.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/wscons/SDL_wsconsevents_c.h b/src/video/wscons/SDL_wsconsevents_c.h index 250574e6d..57a1bfe6b 100644 --- a/src/video/wscons/SDL_wsconsevents_c.h +++ b/src/video/wscons/SDL_wsconsevents_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_wsconsvideo.h" diff --git a/src/video/wscons/SDL_wsconsmouse.c b/src/video/wscons/SDL_wsconsmouse.c index 6116f6fd8..f74c226d6 100644 --- a/src/video/wscons/SDL_wsconsmouse.c +++ b/src/video/wscons/SDL_wsconsmouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/wscons/SDL_wsconsmouse_c.h b/src/video/wscons/SDL_wsconsmouse_c.h index d33653619..30d0ec2d7 100644 --- a/src/video/wscons/SDL_wsconsmouse_c.h +++ b/src/video/wscons/SDL_wsconsmouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_wsconsvideo.h" diff --git a/src/video/wscons/SDL_wsconsvideo.c b/src/video/wscons/SDL_wsconsvideo.c index 526315bd8..4312b8ba5 100644 --- a/src/video/wscons/SDL_wsconsvideo.c +++ b/src/video/wscons/SDL_wsconsvideo.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/wscons/SDL_wsconsvideo.h b/src/video/wscons/SDL_wsconsvideo.h index 538cbaed3..112203fa1 100644 --- a/src/video/wscons/SDL_wsconsvideo.h +++ b/src/video/wscons/SDL_wsconsvideo.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_wsconsvideo_h #define _SDL_wsconsvideo_h diff --git a/src/video/x11/SDL_x11dga.c b/src/video/x11/SDL_x11dga.c index cd9cfa300..96d9aa9b9 100644 --- a/src/video/x11/SDL_x11dga.c +++ b/src/video/x11/SDL_x11dga.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is currently only used to enable DGA mouse. The new fullscreen code makes it very difficult to handle DGA dynamically. diff --git a/src/video/x11/SDL_x11dga_c.h b/src/video/x11/SDL_x11dga_c.h index fc5f92825..53b46d5e2 100644 --- a/src/video/x11/SDL_x11dga_c.h +++ b/src/video/x11/SDL_x11dga_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c index 120613cd4..c61bfd9cd 100644 --- a/src/video/x11/SDL_x11dyn.c +++ b/src/video/x11/SDL_x11dyn.c @@ -19,13 +19,12 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if 0 #define DEBUG_DYNAMIC_X11 1 #endif -#include "SDL_config.h" - #define __SDL_NO_REDEFINE_X11_HEADER_SYMS 1 #include "SDL_x11dyn.h" diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h index d3db793ab..1aa4092c6 100644 --- a/src/video/x11/SDL_x11dyn.h +++ b/src/video/x11/SDL_x11dyn.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_x11dyn_h #define _SDL_x11dyn_h diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index 8a7774ce5..e4e9d876d 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Handle the event stream, converting X11 events into SDL events */ diff --git a/src/video/x11/SDL_x11events_c.h b/src/video/x11/SDL_x11events_c.h index a3e84b960..3041287f4 100644 --- a/src/video/x11/SDL_x11events_c.h +++ b/src/video/x11/SDL_x11events_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11gamma.c b/src/video/x11/SDL_x11gamma.c index b60d66eb8..7f37dba91 100644 --- a/src/video/x11/SDL_x11gamma.c +++ b/src/video/x11/SDL_x11gamma.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL.h" #include "SDL_events.h" diff --git a/src/video/x11/SDL_x11gamma_c.h b/src/video/x11/SDL_x11gamma_c.h index ee964d835..3135e19cc 100644 --- a/src/video/x11/SDL_x11gamma_c.h +++ b/src/video/x11/SDL_x11gamma_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_x11gamma_h #define _SDL_x11gamma_h diff --git a/src/video/x11/SDL_x11gl.c b/src/video/x11/SDL_x11gl.c index 1e211747e..23f0b5990 100644 --- a/src/video/x11/SDL_x11gl.c +++ b/src/video/x11/SDL_x11gl.c @@ -19,17 +19,20 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" #include "../../events/SDL_events_c.h" #include "SDL_x11dga_c.h" #include "SDL_x11gl_c.h" -#if defined(sgi) +#if defined(__IRIX__) /* IRIX doesn't have a GL library versioning system */ #define DEFAULT_OPENGL "libGL.so" -#elif defined(MACOSX) +#elif defined(__MACOSX__) #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" +#elif defined(__QNXNTO__) +#define DEFAULT_OPENGL "libGL.so.3" #else #define DEFAULT_OPENGL "libGL.so.1" #endif diff --git a/src/video/x11/SDL_x11gl_c.h b/src/video/x11/SDL_x11gl_c.h index 15d89384b..0535678de 100644 --- a/src/video/x11/SDL_x11gl_c.h +++ b/src/video/x11/SDL_x11gl_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #if SDL_VIDEO_OPENGL_GLX #include diff --git a/src/video/x11/SDL_x11image.c b/src/video/x11/SDL_x11image.c index 4e7e4756e..c4cc03003 100644 --- a/src/video/x11/SDL_x11image.c +++ b/src/video/x11/SDL_x11image.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include @@ -148,7 +149,7 @@ static int num_CPU(void) static int num_cpus = 0; if(!num_cpus) { -#if defined(__linux) +#if defined(__LINUX__) char line[BUFSIZ]; FILE *pstat = fopen("/proc/stat", "r"); if ( pstat ) { @@ -159,7 +160,7 @@ static int num_CPU(void) } fclose(pstat); } -#elif defined(__sgi) +#elif defined(__IRIX__) num_cpus = sysconf(_SC_NPROC_ONLN); #elif defined(_SC_NPROCESSORS_ONLN) /* number of processors online (SVR4.0MP compliant machines) */ diff --git a/src/video/x11/SDL_x11image_c.h b/src/video/x11/SDL_x11image_c.h index 1e3d08212..52ff838b4 100644 --- a/src/video/x11/SDL_x11image_c.h +++ b/src/video/x11/SDL_x11image_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c index a52234a1b..3b0b8553b 100644 --- a/src/video/x11/SDL_x11modes.c +++ b/src/video/x11/SDL_x11modes.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Utilities for getting and setting the X display mode */ diff --git a/src/video/x11/SDL_x11modes_c.h b/src/video/x11/SDL_x11modes_c.h index 5797614d0..a36373827 100644 --- a/src/video/x11/SDL_x11modes_c.h +++ b/src/video/x11/SDL_x11modes_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Utilities for getting and setting the X display mode */ diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c index 9d25e14d8..e0d48c76c 100644 --- a/src/video/x11/SDL_x11mouse.c +++ b/src/video/x11/SDL_x11mouse.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/x11/SDL_x11mouse_c.h b/src/video/x11/SDL_x11mouse_c.h index 3a76fa919..84914da20 100644 --- a/src/video/x11/SDL_x11mouse_c.h +++ b/src/video/x11/SDL_x11mouse_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index a32419b7e..7adb2cb54 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* X11 based SDL video driver implementation. Note: This implementation does not currently need X11 thread locking, @@ -266,7 +267,7 @@ static int xext_errhandler(Display *d, char *ext_name, char *reason) static char *get_classname(char *classname, int maxlen) { char *spot; -#if defined(linux) || defined(__FreeBSD__) +#if defined(__LINUX__) || defined(__FREEBSD__) char procfile[1024]; char linkfile[1024]; int linksize; @@ -280,10 +281,10 @@ static char *get_classname(char *classname, int maxlen) } /* Next look at the application's executable name */ -#if defined(linux) || defined(__FreeBSD__) -#if defined(linux) +#if defined(__LINUX__) || defined(__FREEBSD__) +#if defined(__LINUX__) SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid()); -#elif defined(__FreeBSD__) +#elif defined(__FREEBSD__) SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", getpid()); #else #error Where can we find the executable name? @@ -299,7 +300,7 @@ static char *get_classname(char *classname, int maxlen) } return classname; } -#endif /* linux */ +#endif /* __LINUX__ */ /* Finally use the default we've used forever */ SDL_strlcpy(classname, "SDL_App", maxlen); diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h index 71f02f99a..b7330385b 100644 --- a/src/video/x11/SDL_x11video.h +++ b/src/video/x11/SDL_x11video.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_x11video_h #define _SDL_x11video_h diff --git a/src/video/x11/SDL_x11wm.c b/src/video/x11/SDL_x11wm.c index 2efc3f020..eec866125 100644 --- a/src/video/x11/SDL_x11wm.c +++ b/src/video/x11/SDL_x11wm.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include #include diff --git a/src/video/x11/SDL_x11wm_c.h b/src/video/x11/SDL_x11wm_c.h index b54630847..f258fe450 100644 --- a/src/video/x11/SDL_x11wm_c.h +++ b/src/video/x11/SDL_x11wm_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c index 247d36362..d34045fc9 100644 --- a/src/video/x11/SDL_x11yuv.c +++ b/src/video/x11/SDL_x11yuv.c @@ -19,11 +19,10 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the XFree86 Xv extension implementation of YUV video overlays */ -#include "SDL_config.h" - #if SDL_VIDEO_DRIVER_X11_XV #include diff --git a/src/video/x11/SDL_x11yuv_c.h b/src/video/x11/SDL_x11yuv_c.h index 874e60459..734644042 100644 --- a/src/video/x11/SDL_x11yuv_c.h +++ b/src/video/x11/SDL_x11yuv_c.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* This is the XFree86 Xv extension implementation of YUV video overlays */ diff --git a/src/video/xbios/SDL_xbios.c b/src/video/xbios/SDL_xbios.c index 8ff6b17cf..7aaa38995 100644 --- a/src/video/xbios/SDL_xbios.c +++ b/src/video/xbios/SDL_xbios.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* * Xbios SDL video driver diff --git a/src/video/xbios/SDL_xbios.h b/src/video/xbios/SDL_xbios.h index 8355c2d2a..fce132615 100644 --- a/src/video/xbios/SDL_xbios.h +++ b/src/video/xbios/SDL_xbios.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" #ifndef _SDL_xbios_h #define _SDL_xbios_h diff --git a/src/video/xbios/SDL_xbios_blowup.c b/src/video/xbios/SDL_xbios_blowup.c index 8491bf2ba..e102a2e70 100644 --- a/src/video/xbios/SDL_xbios_blowup.c +++ b/src/video/xbios/SDL_xbios_blowup.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Blowup extension definitions diff --git a/src/video/xbios/SDL_xbios_blowup.h b/src/video/xbios/SDL_xbios_blowup.h index 3d57768bf..ae65c0982 100644 --- a/src/video/xbios/SDL_xbios_blowup.h +++ b/src/video/xbios/SDL_xbios_blowup.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Blowup extension definitions diff --git a/src/video/xbios/SDL_xbios_centscreen.c b/src/video/xbios/SDL_xbios_centscreen.c index 14218c91a..96e5d7ed8 100644 --- a/src/video/xbios/SDL_xbios_centscreen.c +++ b/src/video/xbios/SDL_xbios_centscreen.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Centscreen extension definitions diff --git a/src/video/xbios/SDL_xbios_centscreen.h b/src/video/xbios/SDL_xbios_centscreen.h index 45871edf3..8d23e7e17 100644 --- a/src/video/xbios/SDL_xbios_centscreen.h +++ b/src/video/xbios/SDL_xbios_centscreen.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* Centscreen extension definitions diff --git a/src/video/xbios/SDL_xbios_sb3.c b/src/video/xbios/SDL_xbios_sb3.c index 8bca717c0..bcd610a0c 100644 --- a/src/video/xbios/SDL_xbios_sb3.c +++ b/src/video/xbios/SDL_xbios_sb3.c @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* ScreenBlaster 3 functions diff --git a/src/video/xbios/SDL_xbios_sb3.h b/src/video/xbios/SDL_xbios_sb3.h index 3b681d197..5179d31b0 100644 --- a/src/video/xbios/SDL_xbios_sb3.h +++ b/src/video/xbios/SDL_xbios_sb3.h @@ -19,6 +19,7 @@ Sam Lantinga slouken@libsdl.org */ +#include "SDL_config.h" /* ScreenBlaster 3 definitions diff --git a/test/testdyngl.c b/test/testdyngl.c index 77dce2d44..1748ea027 100644 --- a/test/testdyngl.c +++ b/test/testdyngl.c @@ -96,16 +96,18 @@ int main(int argc,char *argv[]) SDL_Event event; int done=0; GLfloat pixels[NB_PIXELS*3]; -#if defined(_WIN32) - char *gl_library = "OpenGL32.DLL"; +#if defined(__IRIX__) + const char *gl_library = "libGL.so"; +#elif defined(__MACOSX__) + const char *gl_library = "/usr/X11R6/lib/libGL.1.dylib"; #elif defined(__QNXNTO__) - char *gl_library = "libGL.so.3"; -#elif defined(_SGI_SOURCE) - char *gl_library = "libGL.so"; + const char *gl_library = "libGL.so.3"; +#elif defined(__WIN32__) + const char *gl_library = "OpenGL32.DLL"; #else - char *gl_library = "libGL.so.1"; + const char *gl_library = "libGL.so.1"; #endif - + if (argv[1]) { gl_library = argv[1]; }