Use consistent identifiers for the various platforms we support.
authorSam Lantinga <slouken@libsdl.org>
Tue, 21 Feb 2006 08:46:50 +0000
changeset 1402d910939febfa
parent 1401 1819fd069e89
child 1403 376665398b25
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
include/SDL_config.h
include/SDL_config.h.in
include/SDL_config.h.minimal
include/SDL_cpuinfo.h
include/SDL_main.h
include/SDL_opengl.h
include/SDL_platform.h
include/SDL_rwops.h
include/SDL_stdinc.h
include/SDL_thread.h
include/begin_code.h
include/close_code.h
src/SDL.c
src/SDL_error.c
src/SDL_error_c.h
src/SDL_fatal.c
src/SDL_fatal.h
src/audio/SDL_audio.c
src/audio/SDL_audio_c.h
src/audio/SDL_audiocvt.c
src/audio/SDL_audiodev.c
src/audio/SDL_audiodev_c.h
src/audio/SDL_audiomem.h
src/audio/SDL_mixer.c
src/audio/SDL_mixer_MMX.c
src/audio/SDL_mixer_MMX.h
src/audio/SDL_mixer_MMX_VC.c
src/audio/SDL_mixer_MMX_VC.h
src/audio/SDL_mixer_m68k.c
src/audio/SDL_mixer_m68k.h
src/audio/SDL_sysaudio.h
src/audio/SDL_wave.c
src/audio/SDL_wave.h
src/audio/alsa/SDL_alsa_audio.c
src/audio/alsa/SDL_alsa_audio.h
src/audio/amigaos/SDL_ahiaudio.c
src/audio/amigaos/SDL_ahiaudio.h
src/audio/arts/SDL_artsaudio.c
src/audio/arts/SDL_artsaudio.h
src/audio/baudio/SDL_beaudio.h
src/audio/dart/SDL_dart.c
src/audio/dart/SDL_dart.h
src/audio/dc/SDL_dcaudio.c
src/audio/dc/SDL_dcaudio.h
src/audio/dc/aica.h
src/audio/disk/SDL_diskaudio.c
src/audio/disk/SDL_diskaudio.h
src/audio/dma/SDL_dmaaudio.c
src/audio/dma/SDL_dmaaudio.h
src/audio/dmedia/SDL_irixaudio.c
src/audio/dmedia/SDL_irixaudio.h
src/audio/dsp/SDL_dspaudio.c
src/audio/dsp/SDL_dspaudio.h
src/audio/esd/SDL_esdaudio.c
src/audio/esd/SDL_esdaudio.h
src/audio/macosx/SDL_coreaudio.c
src/audio/macosx/SDL_coreaudio.h
src/audio/macrom/SDL_romaudio.c
src/audio/macrom/SDL_romaudio.h
src/audio/mint/SDL_mintaudio.c
src/audio/mint/SDL_mintaudio.h
src/audio/mint/SDL_mintaudio_dma8.c
src/audio/mint/SDL_mintaudio_dma8.h
src/audio/mint/SDL_mintaudio_gsxb.c
src/audio/mint/SDL_mintaudio_gsxb.h
src/audio/mint/SDL_mintaudio_mcsn.c
src/audio/mint/SDL_mintaudio_mcsn.h
src/audio/mint/SDL_mintaudio_stfa.c
src/audio/mint/SDL_mintaudio_stfa.h
src/audio/mint/SDL_mintaudio_xbios.c
src/audio/mme/SDL_mmeaudio.c
src/audio/mme/SDL_mmeaudio.h
src/audio/nas/SDL_nasaudio.c
src/audio/nas/SDL_nasaudio.h
src/audio/nto/SDL_nto_audio.c
src/audio/nto/SDL_nto_audio.h
src/audio/openbsd/SDL_openbsdaudio.c
src/audio/openbsd/SDL_openbsdaudio.h
src/audio/paudio/SDL_paudio.c
src/audio/paudio/SDL_paudio.h
src/audio/sun/SDL_sunaudio.c
src/audio/sun/SDL_sunaudio.h
src/audio/ums/SDL_umsaudio.c
src/audio/ums/SDL_umsaudio.h
src/audio/windib/SDL_dibaudio.c
src/audio/windib/SDL_dibaudio.h
src/audio/windx5/SDL_dx5audio.c
src/audio/windx5/SDL_dx5audio.h
src/cdrom/SDL_cdrom.c
src/cdrom/SDL_syscdrom.h
src/cdrom/aix/SDL_syscdrom.c
src/cdrom/bsdi/SDL_syscdrom.c
src/cdrom/dc/SDL_syscdrom.c
src/cdrom/dummy/SDL_syscdrom.c
src/cdrom/freebsd/SDL_syscdrom.c
src/cdrom/linux/SDL_syscdrom.c
src/cdrom/macos/SDL_syscdrom.c
src/cdrom/macos/SDL_syscdrom_c.h
src/cdrom/macosx/AudioFilePlayer.c
src/cdrom/macosx/AudioFilePlayer.h
src/cdrom/macosx/AudioFileReaderThread.c
src/cdrom/macosx/CDPlayer.c
src/cdrom/macosx/CDPlayer.h
src/cdrom/macosx/SDLOSXCAGuard.c
src/cdrom/macosx/SDLOSXCAGuard.h
src/cdrom/macosx/SDL_syscdrom.c
src/cdrom/macosx/SDL_syscdrom_c.h
src/cdrom/mint/SDL_syscdrom.c
src/cdrom/openbsd/SDL_syscdrom.c
src/cdrom/os2/SDL_syscdrom.c
src/cdrom/osf/SDL_syscdrom.c
src/cdrom/qnx/SDL_syscdrom.c
src/cdrom/win32/SDL_syscdrom.c
src/cpuinfo/SDL_cpuinfo.c
src/events/SDL_active.c
src/events/SDL_events.c
src/events/SDL_events_c.h
src/events/SDL_expose.c
src/events/SDL_keyboard.c
src/events/SDL_mouse.c
src/events/SDL_quit.c
src/events/SDL_resize.c
src/events/SDL_sysevents.h
src/file/SDL_rwops.c
src/hermes/HeadMMX.h
src/joystick/SDL_joystick.c
src/joystick/SDL_joystick_c.h
src/joystick/SDL_sysjoystick.h
src/joystick/amigaos/SDL_sysjoystick.c
src/joystick/bsd/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick.c
src/joystick/dc/SDL_sysjoystick.c
src/joystick/dummy/SDL_sysjoystick.c
src/joystick/linux/SDL_sysjoystick.c
src/joystick/macos/SDL_sysjoystick.c
src/joystick/mint/SDL_sysjoystick.c
src/joystick/os2/SDL_sysjoystick.c
src/joystick/riscos/SDL_sysjoystick.c
src/joystick/win32/SDL_mmjoystick.c
src/loadso/beos/SDL_sysloadso.c
src/loadso/dlopen/SDL_sysloadso.c
src/loadso/dummy/SDL_sysloadso.c
src/loadso/macos/SDL_sysloadso.c
src/loadso/macosx/SDL_sysloadso.c
src/loadso/mint/SDL_sysloadso.c
src/loadso/os2/SDL_sysloadso.c
src/loadso/win32/SDL_sysloadso.c
src/main/beos/SDL_BeApp.h
src/stdlib/SDL_getenv.c
src/stdlib/SDL_malloc.c
src/stdlib/SDL_qsort.c
src/stdlib/SDL_stdlib.c
src/stdlib/SDL_string.c
src/thread/SDL_systhread.h
src/thread/SDL_thread.c
src/thread/SDL_thread_c.h
src/thread/amigaos/SDL_syssem.c
src/thread/amigaos/SDL_systhread.c
src/thread/amigaos/SDL_systhread_c.h
src/thread/amigaos/SDL_thread.c
src/thread/beos/SDL_syssem.c
src/thread/beos/SDL_systhread.c
src/thread/beos/SDL_systhread_c.h
src/thread/dc/SDL_syscond.c
src/thread/dc/SDL_syscond_c.h
src/thread/dc/SDL_sysmutex.c
src/thread/dc/SDL_sysmutex_c.h
src/thread/dc/SDL_syssem.c
src/thread/dc/SDL_syssem_c.h
src/thread/dc/SDL_systhread.c
src/thread/dc/SDL_systhread_c.h
src/thread/epoc/SDL_systhread_c.h
src/thread/generic/SDL_syscond.c
src/thread/generic/SDL_sysmutex.c
src/thread/generic/SDL_sysmutex_c.h
src/thread/generic/SDL_syssem.c
src/thread/generic/SDL_systhread.c
src/thread/generic/SDL_systhread_c.h
src/thread/irix/SDL_syssem.c
src/thread/irix/SDL_systhread.c
src/thread/irix/SDL_systhread_c.h
src/thread/os2/SDL_syscond.c
src/thread/os2/SDL_syscond_c.h
src/thread/os2/SDL_sysmutex.c
src/thread/os2/SDL_syssem.c
src/thread/os2/SDL_systhread.c
src/thread/os2/SDL_systhread_c.h
src/thread/pth/SDL_syscond.c
src/thread/pth/SDL_sysmutex.c
src/thread/pth/SDL_sysmutex_c.h
src/thread/pth/SDL_systhread.c
src/thread/pth/SDL_systhread_c.h
src/thread/pthread/SDL_syscond.c
src/thread/pthread/SDL_sysmutex.c
src/thread/pthread/SDL_sysmutex_c.h
src/thread/pthread/SDL_syssem.c
src/thread/pthread/SDL_systhread.c
src/thread/pthread/SDL_systhread_c.h
src/thread/riscos/SDL_syscond.c
src/thread/riscos/SDL_sysmutex.c
src/thread/riscos/SDL_sysmutex_c.h
src/thread/riscos/SDL_syssem.c
src/thread/riscos/SDL_systhread.c
src/thread/riscos/SDL_systhread_c.h
src/thread/win32/SDL_sysmutex.c
src/thread/win32/SDL_syssem.c
src/thread/win32/SDL_systhread.c
src/thread/win32/SDL_systhread_c.h
src/timer/SDL_systimer.h
src/timer/SDL_timer.c
src/timer/SDL_timer_c.h
src/timer/amigaos/SDL_systimer.c
src/timer/beos/SDL_systimer.c
src/timer/dc/SDL_systimer.c
src/timer/dummy/SDL_systimer.c
src/timer/macos/FastTimes.h
src/timer/macos/SDL_MPWtimer.c
src/timer/macos/SDL_systimer.c
src/timer/mint/SDL_systimer.c
src/timer/mint/SDL_vbltimer_s.h
src/timer/os2/SDL_systimer.c
src/timer/riscos/SDL_systimer.c
src/timer/unix/SDL_systimer.c
src/timer/win32/SDL_systimer.c
src/timer/wince/SDL_systimer.c
src/video/SDL_RLEaccel.c
src/video/SDL_RLEaccel_c.h
src/video/SDL_blit.c
src/video/SDL_blit.h
src/video/SDL_blit_0.c
src/video/SDL_blit_1.c
src/video/SDL_blit_A.c
src/video/SDL_blit_N.c
src/video/SDL_bmp.c
src/video/SDL_cursor.c
src/video/SDL_cursor_c.h
src/video/SDL_gamma.c
src/video/SDL_leaks.h
src/video/SDL_pixels.c
src/video/SDL_pixels_c.h
src/video/SDL_stretch.c
src/video/SDL_stretch_c.h
src/video/SDL_surface.c
src/video/SDL_sysvideo.h
src/video/SDL_video.c
src/video/SDL_yuv.c
src/video/SDL_yuv_mmx.c
src/video/SDL_yuv_sw.c
src/video/SDL_yuv_sw_c.h
src/video/SDL_yuvfuncs.h
src/video/aalib/SDL_aaevents.c
src/video/aalib/SDL_aaevents_c.h
src/video/aalib/SDL_aamouse.c
src/video/aalib/SDL_aamouse_c.h
src/video/aalib/SDL_aavideo.c
src/video/aalib/SDL_aavideo.h
src/video/ataricommon/SDL_ataric2p_s.h
src/video/ataricommon/SDL_atarieddi_s.h
src/video/ataricommon/SDL_atarievents.c
src/video/ataricommon/SDL_atarievents_c.h
src/video/ataricommon/SDL_atarigl.c
src/video/ataricommon/SDL_atarigl_c.h
src/video/ataricommon/SDL_atarimxalloc.c
src/video/ataricommon/SDL_atarimxalloc_c.h
src/video/ataricommon/SDL_biosevents.c
src/video/ataricommon/SDL_biosevents_c.h
src/video/ataricommon/SDL_gemdosevents.c
src/video/ataricommon/SDL_gemdosevents_c.h
src/video/ataricommon/SDL_ikbdevents.c
src/video/ataricommon/SDL_ikbdevents_c.h
src/video/ataricommon/SDL_ikbdinterrupt_s.h
src/video/ataricommon/SDL_xbiosevents.c
src/video/ataricommon/SDL_xbiosevents_c.h
src/video/ataricommon/SDL_xbiosinterrupt_s.h
src/video/bwindow/SDL_BView.h
src/video/bwindow/SDL_lowvideo.h
src/video/bwindow/SDL_sysevents_c.h
src/video/bwindow/SDL_sysmouse_c.h
src/video/bwindow/SDL_syswm_c.h
src/video/bwindow/SDL_sysyuv.h
src/video/cybergfx/SDL_amigaevents.c
src/video/cybergfx/SDL_amigaevents_c.h
src/video/cybergfx/SDL_amigamouse.c
src/video/cybergfx/SDL_amigamouse_c.h
src/video/cybergfx/SDL_cgxaccel.c
src/video/cybergfx/SDL_cgxgl.c
src/video/cybergfx/SDL_cgxgl_c.h
src/video/cybergfx/SDL_cgximage.c
src/video/cybergfx/SDL_cgximage_c.h
src/video/cybergfx/SDL_cgxmodes.c
src/video/cybergfx/SDL_cgxmodes_c.h
src/video/cybergfx/SDL_cgxvideo.c
src/video/cybergfx/SDL_cgxvideo.h
src/video/cybergfx/SDL_cgxwm.c
src/video/cybergfx/SDL_cgxwm_c.h
src/video/dc/SDL_dcevents.c
src/video/dc/SDL_dcevents_c.h
src/video/dc/SDL_dcmouse.c
src/video/dc/SDL_dcmouse_c.h
src/video/dc/SDL_dcvideo.c
src/video/dc/SDL_dcvideo.h
src/video/dga/SDL_dgaevents.c
src/video/dga/SDL_dgaevents_c.h
src/video/dga/SDL_dgamouse.c
src/video/dga/SDL_dgamouse_c.h
src/video/dga/SDL_dgavideo.c
src/video/dga/SDL_dgavideo.h
src/video/directfb/SDL_DirectFB_events.c
src/video/directfb/SDL_DirectFB_events.h
src/video/directfb/SDL_DirectFB_video.c
src/video/directfb/SDL_DirectFB_video.h
src/video/directfb/SDL_DirectFB_yuv.c
src/video/directfb/SDL_DirectFB_yuv.h
src/video/dummy/SDL_nullevents.c
src/video/dummy/SDL_nullevents_c.h
src/video/dummy/SDL_nullmouse.c
src/video/dummy/SDL_nullmouse_c.h
src/video/dummy/SDL_nullvideo.c
src/video/dummy/SDL_nullvideo.h
src/video/epoc/SDL_epocevents_c.h
src/video/epoc/SDL_epocvideo.h
src/video/fbcon/3dfx_mmio.h
src/video/fbcon/3dfx_regs.h
src/video/fbcon/SDL_fb3dfx.c
src/video/fbcon/SDL_fb3dfx.h
src/video/fbcon/SDL_fbelo.c
src/video/fbcon/SDL_fbelo.h
src/video/fbcon/SDL_fbevents.c
src/video/fbcon/SDL_fbevents_c.h
src/video/fbcon/SDL_fbmatrox.c
src/video/fbcon/SDL_fbmatrox.h
src/video/fbcon/SDL_fbmouse.c
src/video/fbcon/SDL_fbmouse_c.h
src/video/fbcon/SDL_fbriva.c
src/video/fbcon/SDL_fbriva.h
src/video/fbcon/SDL_fbvideo.c
src/video/fbcon/SDL_fbvideo.h
src/video/fbcon/matrox_mmio.h
src/video/fbcon/riva_regs.h
src/video/gapi/SDL_gapivideo.c
src/video/gapi/SDL_gapivideo.h
src/video/gem/SDL_gemevents.c
src/video/gem/SDL_gemevents_c.h
src/video/gem/SDL_gemmouse.c
src/video/gem/SDL_gemmouse_c.h
src/video/gem/SDL_gemvideo.c
src/video/gem/SDL_gemvideo.h
src/video/gem/SDL_gemwm.c
src/video/gem/SDL_gemwm_c.h
src/video/ggi/SDL_ggievents.c
src/video/ggi/SDL_ggievents_c.h
src/video/ggi/SDL_ggimouse.c
src/video/ggi/SDL_ggimouse_c.h
src/video/ggi/SDL_ggivideo.c
src/video/ggi/SDL_ggivideo.h
src/video/ipod/SDL_ipodvideo.c
src/video/ipod/SDL_ipodvideo.h
src/video/maccommon/SDL_lowvideo.h
src/video/maccommon/SDL_macevents.c
src/video/maccommon/SDL_macevents_c.h
src/video/maccommon/SDL_macgl.c
src/video/maccommon/SDL_macgl_c.h
src/video/maccommon/SDL_macmouse.c
src/video/maccommon/SDL_macmouse_c.h
src/video/maccommon/SDL_macwm.c
src/video/maccommon/SDL_macwm_c.h
src/video/macdsp/SDL_dspvideo.c
src/video/macdsp/SDL_dspvideo.h
src/video/macrom/SDL_romvideo.c
src/video/macrom/SDL_romvideo.h
src/video/nanox/SDL_nxevents.c
src/video/nanox/SDL_nxevents_c.h
src/video/nanox/SDL_nximage.c
src/video/nanox/SDL_nximage_c.h
src/video/nanox/SDL_nxmodes.c
src/video/nanox/SDL_nxmodes_c.h
src/video/nanox/SDL_nxmouse.c
src/video/nanox/SDL_nxmouse_c.h
src/video/nanox/SDL_nxvideo.c
src/video/nanox/SDL_nxvideo.h
src/video/nanox/SDL_nxwm.c
src/video/nanox/SDL_nxwm_c.h
src/video/os2fslib/SDL_os2fslib.c
src/video/os2fslib/SDL_os2fslib.h
src/video/photon/SDL_ph_events.c
src/video/photon/SDL_ph_events_c.h
src/video/photon/SDL_ph_gl.c
src/video/photon/SDL_ph_gl.h
src/video/photon/SDL_ph_image.c
src/video/photon/SDL_ph_image_c.h
src/video/photon/SDL_ph_modes.c
src/video/photon/SDL_ph_modes_c.h
src/video/photon/SDL_ph_mouse.c
src/video/photon/SDL_ph_mouse_c.h
src/video/photon/SDL_ph_video.c
src/video/photon/SDL_ph_video.h
src/video/photon/SDL_ph_wm.c
src/video/photon/SDL_ph_wm_c.h
src/video/photon/SDL_phyuv.c
src/video/photon/SDL_phyuv_c.h
src/video/picogui/SDL_pgevents.c
src/video/picogui/SDL_pgevents_c.h
src/video/picogui/SDL_pgvideo.c
src/video/picogui/SDL_pgvideo.h
src/video/ps2gs/SDL_gsevents.c
src/video/ps2gs/SDL_gsevents_c.h
src/video/ps2gs/SDL_gsmouse.c
src/video/ps2gs/SDL_gsmouse_c.h
src/video/ps2gs/SDL_gsvideo.c
src/video/ps2gs/SDL_gsvideo.h
src/video/ps2gs/SDL_gsyuv.c
src/video/ps2gs/SDL_gsyuv_c.h
src/video/qtopia/SDL_QPEApp.h
src/video/qtopia/SDL_QWin.h
src/video/qtopia/SDL_lowvideo.h
src/video/qtopia/SDL_sysevents_c.h
src/video/qtopia/SDL_sysmouse_c.h
src/video/qtopia/SDL_syswm_c.h
src/video/quartz/CGS.h
src/video/quartz/SDL_QuartzKeys.h
src/video/quartz/SDL_QuartzVideo.h
src/video/quartz/SDL_QuartzWindow.h
src/video/riscos/SDL_riscosFullScreenVideo.c
src/video/riscos/SDL_riscosevents.c
src/video/riscos/SDL_riscosevents_c.h
src/video/riscos/SDL_riscosmouse.c
src/video/riscos/SDL_riscosmouse_c.h
src/video/riscos/SDL_riscossprite.c
src/video/riscos/SDL_riscostask.c
src/video/riscos/SDL_riscostask.h
src/video/riscos/SDL_riscosvideo.c
src/video/riscos/SDL_riscosvideo.h
src/video/riscos/SDL_wimppoll.c
src/video/riscos/SDL_wimpvideo.c
src/video/svga/SDL_svgaevents.c
src/video/svga/SDL_svgaevents_c.h
src/video/svga/SDL_svgamouse.c
src/video/svga/SDL_svgamouse_c.h
src/video/svga/SDL_svgavideo.c
src/video/svga/SDL_svgavideo.h
src/video/vgl/SDL_vglevents.c
src/video/vgl/SDL_vglevents_c.h
src/video/vgl/SDL_vglmouse.c
src/video/vgl/SDL_vglmouse_c.h
src/video/vgl/SDL_vglvideo.c
src/video/vgl/SDL_vglvideo.h
src/video/wincommon/SDL_lowvideo.h
src/video/wincommon/SDL_sysevents.c
src/video/wincommon/SDL_sysmouse.c
src/video/wincommon/SDL_sysmouse_c.h
src/video/wincommon/SDL_syswm.c
src/video/wincommon/SDL_syswm_c.h
src/video/wincommon/SDL_wingl.c
src/video/wincommon/SDL_wingl_c.h
src/video/windib/SDL_dibevents.c
src/video/windib/SDL_dibevents_c.h
src/video/windib/SDL_dibvideo.c
src/video/windib/SDL_dibvideo.h
src/video/windx5/SDL_dx5events.c
src/video/windx5/SDL_dx5events_c.h
src/video/windx5/SDL_dx5video.c
src/video/windx5/SDL_dx5video.h
src/video/windx5/SDL_dx5yuv.c
src/video/windx5/SDL_dx5yuv_c.h
src/video/wscons/SDL_wsconsevents.c
src/video/wscons/SDL_wsconsevents_c.h
src/video/wscons/SDL_wsconsmouse.c
src/video/wscons/SDL_wsconsmouse_c.h
src/video/wscons/SDL_wsconsvideo.c
src/video/wscons/SDL_wsconsvideo.h
src/video/x11/SDL_x11dga.c
src/video/x11/SDL_x11dga_c.h
src/video/x11/SDL_x11dyn.c
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11events_c.h
src/video/x11/SDL_x11gamma.c
src/video/x11/SDL_x11gamma_c.h
src/video/x11/SDL_x11gl.c
src/video/x11/SDL_x11gl_c.h
src/video/x11/SDL_x11image.c
src/video/x11/SDL_x11image_c.h
src/video/x11/SDL_x11modes.c
src/video/x11/SDL_x11modes_c.h
src/video/x11/SDL_x11mouse.c
src/video/x11/SDL_x11mouse_c.h
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11wm.c
src/video/x11/SDL_x11wm_c.h
src/video/x11/SDL_x11yuv.c
src/video/x11/SDL_x11yuv_c.h
src/video/xbios/SDL_xbios.c
src/video/xbios/SDL_xbios.h
src/video/xbios/SDL_xbios_blowup.c
src/video/xbios/SDL_xbios_blowup.h
src/video/xbios/SDL_xbios_centscreen.c
src/video/xbios/SDL_xbios_centscreen.h
src/video/xbios/SDL_xbios_sb3.c
src/video/xbios/SDL_xbios_sb3.h
test/testdyngl.c
     1.1 --- a/configure.in	Tue Feb 21 08:34:45 2006 +0000
     1.2 +++ b/configure.in	Tue Feb 21 08:46:50 2006 +0000
     1.3 @@ -57,10 +57,10 @@
     1.4  case "$target" in
     1.5      *-*-cygwin*)
     1.6          # We build SDL on cygwin without the UNIX emulation layer
     1.7 -        CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
     1.8 +        CFLAGS="$CFLAGS -I/usr/include/mingw -mno-cygwin"
     1.9          BUILD_CFLAGS="$CFLAGS \$(INCLUDE)"
    1.10          BUILD_LDFLAGS="$LDFLAGS -mno-cygwin"
    1.11 -        SDL_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
    1.12 +        SDL_CFLAGS="-I/usr/include/mingw -mno-cygwin"
    1.13          SDL_LIBS="-lSDL -mno-cygwin"
    1.14          ;;
    1.15      *)
    1.16 @@ -239,11 +239,11 @@
    1.17  if test x$enable_cpuinfo != xyes; then
    1.18      AC_DEFINE(SDL_CPUINFO_DISABLED)
    1.19  fi
    1.20 -AC_ARG_ENABLE(assembly-blit,
    1.21 -AC_HELP_STRING([--enable-asm-blit], [Enable assembly blitters [default=yes]]),
    1.22 -              , enable_asm_blit=yes)
    1.23 -if test x$enable_asm_blit = xyes; then
    1.24 -    AC_DEFINE(SDL_ASSEMBLY_BLITTERS)
    1.25 +AC_ARG_ENABLE(assembly,
    1.26 +AC_HELP_STRING([--enable-assembly], [Enable assembly routines [default=yes]]),
    1.27 +              , enable_assembly=yes)
    1.28 +if test x$enable_assembly = xyes; then
    1.29 +    AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
    1.30  fi
    1.31  
    1.32  dnl See if the OSS audio interface is supported
    1.33 @@ -559,7 +559,7 @@
    1.34      AC_ARG_ENABLE(nasm,
    1.35  AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [default=yes]]),
    1.36                    , enable_nasm=yes)
    1.37 -    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_nasm = xyes; then
    1.38 +    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
    1.39          AC_PATH_PROG(NASM, nasm)
    1.40          if test x$NASM != x -a x$NASM != x'"$NASM"'; then
    1.41              AC_DEFINE(SDL_HERMES_BLITTERS)
    1.42 @@ -595,7 +595,7 @@
    1.43      AC_ARG_ENABLE(altivec,
    1.44  AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [default=yes]]),
    1.45                    , enable_altivec=yes)
    1.46 -    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_altivec = xyes; then
    1.47 +    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then
    1.48          have_altivec_h_hdr=no
    1.49          AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
    1.50  
    1.51 @@ -2012,13 +2012,6 @@
    1.52              SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
    1.53              have_timers=yes
    1.54          fi
    1.55 -        # Do any final platform setup
    1.56 -        case $ARCH in
    1.57 -            openbsd|netbsd)
    1.58 -                # OpenBSD and NetBSD do not define "unix"
    1.59 -                BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
    1.60 -            ;;
    1.61 -        esac
    1.62          ;;
    1.63      *-*-qnx*)
    1.64          ARCH=qnx
    1.65 @@ -2221,8 +2214,7 @@
    1.66          fi
    1.67          # The MacOS X platform requires special setup.
    1.68          SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
    1.69 -        AC_DEFINE(TARGET_API_MAC_CARBON)
    1.70 -        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings -DMACOSX"
    1.71 +        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings"
    1.72          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.73          if test x$enable_video_cocoa = xyes; then
    1.74              BUILD_LDFLAGS="$BUILD_LDFLAGS -framework Cocoa"
    1.75 @@ -2279,8 +2271,6 @@
    1.76              fi
    1.77              have_timers=yes
    1.78          fi
    1.79 -        # MiNT does not define "unix"
    1.80 -        BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
    1.81          ;;
    1.82      *-riscos)
    1.83          ARCH=riscos
     2.1 --- a/include/SDL_config.h	Tue Feb 21 08:34:45 2006 +0000
     2.2 +++ b/include/SDL_config.h	Tue Feb 21 08:46:50 2006 +0000
     2.3 @@ -25,6 +25,8 @@
     2.4  
     2.5  /* This is the minimal configuration that can be used to build SDL */
     2.6  
     2.7 +#include "SDL_platform.h"
     2.8 +
     2.9  #include <stdarg.h>
    2.10  
    2.11  typedef signed char int8_t;
     3.1 --- a/include/SDL_config.h.in	Tue Feb 21 08:34:45 2006 +0000
     3.2 +++ b/include/SDL_config.h.in	Tue Feb 21 08:46:50 2006 +0000
     3.3 @@ -25,6 +25,9 @@
     3.4  
     3.5  /* This is a set of defines to configure the SDL features */
     3.6  
     3.7 +/* General platform specific identifiers */
     3.8 +#include "SDL_platform.h"
     3.9 +
    3.10  /* C language features */
    3.11  #undef const
    3.12  #undef inline
    3.13 @@ -48,7 +51,7 @@
    3.14  
    3.15  /* Comment this if you want to build without any C library requirements */
    3.16  #undef HAVE_LIBC
    3.17 -#ifdef HAVE_LIBC
    3.18 +#if HAVE_LIBC
    3.19  
    3.20  /* Useful headers */
    3.21  #undef HAVE_ALLOCA_H
    3.22 @@ -127,10 +130,6 @@
    3.23  #include <stdarg.h>
    3.24  #endif /* HAVE_LIBC */
    3.25  
    3.26 -/* General platform specific identifiers */
    3.27 -#undef TARGET_API_MAC_CARBON
    3.28 -#undef TARGET_API_MAC_OSX
    3.29 -
    3.30  /* Allow disabling of core subsystems */
    3.31  #undef SDL_AUDIO_DISABLED
    3.32  #undef SDL_CDROM_DISABLED
    3.33 @@ -155,7 +154,6 @@
    3.34  #undef SDL_AUDIO_DRIVER_DC
    3.35  #undef SDL_AUDIO_DRIVER_DISK
    3.36  #undef SDL_AUDIO_DRIVER_DMEDIA
    3.37 -#undef SDL_AUDIO_DRIVER_DRENDERER
    3.38  #undef SDL_AUDIO_DRIVER_DSOUND
    3.39  #undef SDL_AUDIO_DRIVER_ESD
    3.40  #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
    3.41 @@ -285,8 +283,8 @@
    3.42  #undef SDL_VIDEO_OPENGL_OSMESA
    3.43  #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
    3.44  
    3.45 -/* Enable assembly blit routines */
    3.46 -#undef SDL_ASSEMBLY_BLITTERS
    3.47 +/* Enable assembly routines */
    3.48 +#undef SDL_ASSEMBLY_ROUTINES
    3.49  #undef SDL_HERMES_BLITTERS
    3.50  #undef SDL_ALTIVEC_BLITTERS
    3.51  
     4.1 --- a/include/SDL_config.h.minimal	Tue Feb 21 08:34:45 2006 +0000
     4.2 +++ b/include/SDL_config.h.minimal	Tue Feb 21 08:46:50 2006 +0000
     4.3 @@ -25,6 +25,8 @@
     4.4  
     4.5  /* This is the minimal configuration that can be used to build SDL */
     4.6  
     4.7 +#include "SDL_platform.h"
     4.8 +
     4.9  #include <stdarg.h>
    4.10  
    4.11  typedef signed char int8_t;
     5.1 --- a/include/SDL_cpuinfo.h	Tue Feb 21 08:34:45 2006 +0000
     5.2 +++ b/include/SDL_cpuinfo.h	Tue Feb 21 08:46:50 2006 +0000
     5.3 @@ -23,11 +23,11 @@
     5.4  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
     5.5  /* CPU feature detection for SDL                                       */
     5.6  
     5.7 -#include "SDL_stdinc.h"
     5.8 -
     5.9  #ifndef _SDL_cpuinfo_h
    5.10  #define _SDL_cpuinfo_h
    5.11  
    5.12 +#include "SDL_stdinc.h"
    5.13 +
    5.14  #include "begin_code.h"
    5.15  /* Set up for C function definitions, even when using C++ */
    5.16  #ifdef __cplusplus
     6.1 --- a/include/SDL_main.h	Tue Feb 21 08:34:45 2006 +0000
     6.2 +++ b/include/SDL_main.h	Tue Feb 21 08:46:50 2006 +0000
     6.3 @@ -27,9 +27,9 @@
     6.4  
     6.5  /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
     6.6  
     6.7 -#if defined(WIN32) || defined(_WIN32) || \
     6.8 +#if defined(__WIN32__) || \
     6.9      (defined(__MWERKS__) && !defined(__BEOS__)) || \
    6.10 -    defined(macintosh) || defined(__APPLE__) || \
    6.11 +    defined(__MACOS__) || defined(__MACOSX__) || \
    6.12      defined(__SYMBIAN32__) || defined(QWS)
    6.13  
    6.14  #ifdef __cplusplus
    6.15 @@ -54,7 +54,7 @@
    6.16  
    6.17  
    6.18  /* From the SDL library code -- needed for registering the app on Win32 */
    6.19 -#if defined(WIN32)
    6.20 +#ifdef __WIN32__
    6.21  
    6.22  #include "begin_code.h"
    6.23  #ifdef __cplusplus
    6.24 @@ -74,7 +74,7 @@
    6.25  #endif
    6.26  
    6.27  /* From the SDL library code -- needed for registering QuickDraw on MacOS */
    6.28 -#if defined(macintosh)
    6.29 +#if defined(__MACOS__)
    6.30  
    6.31  #include "begin_code.h"
    6.32  #ifdef __cplusplus
     7.1 --- a/include/SDL_opengl.h	Tue Feb 21 08:34:45 2006 +0000
     7.2 +++ b/include/SDL_opengl.h	Tue Feb 21 08:46:50 2006 +0000
     7.3 @@ -22,7 +22,9 @@
     7.4  
     7.5  /* This is a simple file to encapsulate the OpenGL API headers */
     7.6  
     7.7 -#ifdef WIN32
     7.8 +#include "SDL_config.h"
     7.9 +
    7.10 +#ifdef __WIN32__
    7.11  #define WIN32_LEAN_AND_MEAN
    7.12  #ifndef NOMINMAX
    7.13  #define NOMINMAX	/* Don't defined min() and max() */
    7.14 @@ -32,7 +34,7 @@
    7.15  #ifndef NO_SDL_GLEXT
    7.16  #define __glext_h_  /* Don't let gl.h include glext.h */
    7.17  #endif
    7.18 -#if defined(__APPLE__) && defined(__MACH__)
    7.19 +#ifdef __MACOSX__
    7.20  #include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
    7.21  #include <OpenGL/glu.h>	/* Header File For The GLU Library */
    7.22  #else
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/include/SDL_platform.h	Tue Feb 21 08:46:50 2006 +0000
     8.3 @@ -0,0 +1,104 @@
     8.4 +/*
     8.5 +    SDL - Simple DirectMedia Layer
     8.6 +    Copyright (C) 1997-2006 Sam Lantinga
     8.7 +
     8.8 +    This library is free software; you can redistribute it and/or
     8.9 +    modify it under the terms of the GNU Lesser General Public
    8.10 +    License as published by the Free Software Foundation; either
    8.11 +    version 2.1 of the License, or (at your option) any later version.
    8.12 +
    8.13 +    This library is distributed in the hope that it will be useful,
    8.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    8.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    8.16 +    Lesser General Public License for more details.
    8.17 +
    8.18 +    You should have received a copy of the GNU Lesser General Public
    8.19 +    License along with this library; if not, write to the Free Software
    8.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    8.21 +
    8.22 +    Sam Lantinga
    8.23 +    slouken@libsdl.org
    8.24 +*/
    8.25 +
    8.26 +/* Try to get a standard set of platform defines */
    8.27 +
    8.28 +#if defined(_AIX)
    8.29 +#undef __AIX__
    8.30 +#define __AIX__		1
    8.31 +#endif
    8.32 +#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__)
    8.33 +/* FIXME: is this the right test for AmigaOS? */
    8.34 +#undef __AMIGA__
    8.35 +#define __AMIGA__	1
    8.36 +#endif
    8.37 +#if defined(__BEOS__)
    8.38 +#undef __BEOS__
    8.39 +#define __BEOS__	1
    8.40 +#endif
    8.41 +#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
    8.42 +#undef __BSDI__
    8.43 +#define __BSDI__	1
    8.44 +#endif
    8.45 +#if defined(DREAMCAST)
    8.46 +/* FIXME: is this the right test for Dreamcast? */
    8.47 +#undef __DREAMCAST__
    8.48 +#define __DREAMCAST__	1
    8.49 +#endif
    8.50 +#if defined(__FreeBSD__)
    8.51 +#undef __FREEBSD__
    8.52 +#define __FREEBSD__	1
    8.53 +#endif
    8.54 +#if defined(hpux) || defined(__hpux) || defined(__hpux__)
    8.55 +#undef __HPUX__
    8.56 +#define __HPUX__	1
    8.57 +#endif
    8.58 +#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
    8.59 +#undef __IRIX__
    8.60 +#define __IRIX__	1
    8.61 +#endif
    8.62 +#if defined(linux) || defined(__linux) || defined(__linux__)
    8.63 +#undef __LINUX__
    8.64 +#define __LINUX__	1
    8.65 +#endif
    8.66 +#if defined(macintosh)
    8.67 +#undef __MACOS__
    8.68 +#define __MACOS__	1
    8.69 +#endif
    8.70 +#if defined(__GNUC__) && (defined(__APPLE_CC__) || defined(__APPLE_CPP__))
    8.71 +#undef __MACOSX__
    8.72 +#define __MACOSX__	1
    8.73 +#define TARGET_API_MAC_CARBON	1
    8.74 +#endif
    8.75 +#if defined(__NetBSD__)
    8.76 +#undef __NETBSD__
    8.77 +#define __NETBSD__	1
    8.78 +#endif
    8.79 +#if defined(__OpenBSD__)
    8.80 +#undef __OPENBSD__
    8.81 +#define __OPENBSD__	1
    8.82 +#endif
    8.83 +#if defined(__OS2__)
    8.84 +#undef __OS2__
    8.85 +#define __OS2__		1
    8.86 +#endif
    8.87 +#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
    8.88 +#undef __OSF__
    8.89 +#define __OSF__		1
    8.90 +#endif
    8.91 +#if defined(__QNXNTO__)
    8.92 +#undef __QNXNTO__
    8.93 +#define __QNXNTO__	1
    8.94 +#endif
    8.95 +#if defined(riscos) || defined(__riscos) || defined(__riscos__)
    8.96 +#undef __RISCOS__
    8.97 +#define __RISCOS__	1
    8.98 +#endif
    8.99 +#if defined(solaris) || defined(__solaris) || defined(__solaris__)
   8.100 +/* FIXME: is this the right test for Solaris? Check SDL_sunaudio.c */
   8.101 +#undef __SOLARIS__
   8.102 +#define __SOLARIS__	1
   8.103 +#endif
   8.104 +#if defined(WIN32) || defined(_WIN32)
   8.105 +#undef __WIN32__
   8.106 +#define __WIN32__	1
   8.107 +#endif
     9.1 --- a/include/SDL_rwops.h	Tue Feb 21 08:34:45 2006 +0000
     9.2 +++ b/include/SDL_rwops.h	Tue Feb 21 08:46:50 2006 +0000
     9.3 @@ -24,8 +24,8 @@
     9.4     data sources.  It can easily be extended to files, memory, etc.
     9.5  */
     9.6  
     9.7 -#ifndef _SDL_RWops_h
     9.8 -#define _SDL_RWops_h
     9.9 +#ifndef _SDL_rwops_h
    9.10 +#define _SDL_rwops_h
    9.11  
    9.12  #include "SDL_stdinc.h"
    9.13  #include "SDL_error.h"
    9.14 @@ -130,4 +130,4 @@
    9.15  #endif
    9.16  #include "close_code.h"
    9.17  
    9.18 -#endif /* _SDL_RWops_h */
    9.19 +#endif /* _SDL_rwops_h */
    10.1 --- a/include/SDL_stdinc.h	Tue Feb 21 08:34:45 2006 +0000
    10.2 +++ b/include/SDL_stdinc.h	Tue Feb 21 08:46:50 2006 +0000
    10.3 @@ -159,12 +159,12 @@
    10.4  #if HAVE_ALLOCA && !defined(alloca)
    10.5  # if HAVE_ALLOCA_H
    10.6  #  include <alloca.h>
    10.7 -# elif __GNUC__
    10.8 +# elif defined(__GNUC__)
    10.9  #  define alloca __builtin_alloca
   10.10 -# elif _MSC_VER
   10.11 +# elif defined(_MSC_VER)
   10.12  #  include <malloc.h>
   10.13  #  define alloca _alloca
   10.14 -# elif _AIX
   10.15 +# elif defined(__AIX__)
   10.16    #pragma alloca
   10.17  # else
   10.18     char *alloca ();
    11.1 --- a/include/SDL_thread.h	Tue Feb 21 08:34:45 2006 +0000
    11.2 +++ b/include/SDL_thread.h	Tue Feb 21 08:46:50 2006 +0000
    11.3 @@ -45,7 +45,7 @@
    11.4  typedef struct SDL_Thread SDL_Thread;
    11.5  
    11.6  /* Create a thread */
    11.7 -#if defined(_WIN32) || defined(__OS2__)
    11.8 +#if defined(__WIN32__) || defined(__OS2__)
    11.9  /*
   11.10     We compile SDL into a DLL on OS/2. This means, that it's the DLL which
   11.11     creates a new thread for the calling process with the SDL_CreateThread()
    12.1 --- a/include/begin_code.h	Tue Feb 21 08:34:45 2006 +0000
    12.2 +++ b/include/begin_code.h	Tue Feb 21 08:46:50 2006 +0000
    12.3 @@ -31,11 +31,6 @@
    12.4  #endif
    12.5  #define _begin_code_h
    12.6  
    12.7 -/* Make sure the correct platform symbols are defined */
    12.8 -#if !defined(WIN32) && defined(_WIN32)
    12.9 -#define WIN32
   12.10 -#endif /* Windows */
   12.11 -
   12.12  /* Some compilers use a special export keyword */
   12.13  #ifndef DECLSPEC
   12.14  # ifdef __BEOS__
   12.15 @@ -45,7 +40,7 @@
   12.16  #   define DECLSPEC	__declspec(export)
   12.17  #  endif
   12.18  # else
   12.19 -# ifdef WIN32
   12.20 +# ifdef __WIN32__
   12.21  #  ifdef __BORLANDC__
   12.22  #   ifdef BUILD_SDL
   12.23  #    define DECLSPEC 
   12.24 @@ -75,7 +70,7 @@
   12.25  
   12.26  /* By default SDL uses the C calling convention */
   12.27  #ifndef SDLCALL
   12.28 -#if defined(WIN32) && !defined(__GNUC__)
   12.29 +#if defined(__WIN32__) && !defined(__GNUC__)
   12.30  #define SDLCALL __cdecl
   12.31  #else
   12.32  #ifdef __OS2__
   12.33 @@ -107,7 +102,7 @@
   12.34  #pragma nopackwarning
   12.35  #endif
   12.36  #pragma pack(push,4)
   12.37 -#elif (defined(__MWERKS__) && defined(macintosh))
   12.38 +#elif (defined(__MWERKS__) && defined(__MACOS__))
   12.39  #pragma options align=mac68k4byte
   12.40  #pragma enumsalwaysint on
   12.41  #endif /* Compiler needs structure packing set */
    13.1 --- a/include/close_code.h	Tue Feb 21 08:34:45 2006 +0000
    13.2 +++ b/include/close_code.h	Tue Feb 21 08:46:50 2006 +0000
    13.3 @@ -31,7 +31,7 @@
    13.4  #ifdef __BORLANDC__
    13.5  #pragma nopackwarning
    13.6  #endif
    13.7 -#if (defined(__MWERKS__) && defined(macintosh))
    13.8 +#if (defined(__MWERKS__) && defined(__MACOS__))
    13.9  #pragma options align=reset
   13.10  #pragma enumsalwaysint reset
   13.11  #else
    14.1 --- a/src/SDL.c	Tue Feb 21 08:34:45 2006 +0000
    14.2 +++ b/src/SDL.c	Tue Feb 21 08:46:50 2006 +0000
    14.3 @@ -19,6 +19,7 @@
    14.4      Sam Lantinga
    14.5      slouken@libsdl.org
    14.6  */
    14.7 +#include "SDL_config.h"
    14.8  
    14.9  /* Initialization code for SDL */
   14.10  
   14.11 @@ -322,7 +323,7 @@
   14.12  }
   14.13  #endif /* __WATCOMC__ */
   14.14  
   14.15 -#elif defined(_WIN32)
   14.16 +#elif defined(__WIN32__)
   14.17  
   14.18  #if !defined(HAVE_LIBC) || defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL))
   14.19  /* Need to include DllMain() on Windows CE and Watcom C for some reason.. */
   14.20 @@ -343,4 +344,4 @@
   14.21  }
   14.22  #endif /* _WIN32_WCE and building DLL with Watcom C */
   14.23  
   14.24 -#endif /* OS/2 elif _WIN32 */
   14.25 +#endif /* OS/2 elif __WIN32__ */
    15.1 --- a/src/SDL_error.c	Tue Feb 21 08:34:45 2006 +0000
    15.2 +++ b/src/SDL_error.c	Tue Feb 21 08:46:50 2006 +0000
    15.3 @@ -19,6 +19,7 @@
    15.4      Sam Lantinga
    15.5      slouken@libsdl.org
    15.6  */
    15.7 +#include "SDL_config.h"
    15.8  
    15.9  /* Simple error handling in SDL */
   15.10  
    16.1 --- a/src/SDL_error_c.h	Tue Feb 21 08:34:45 2006 +0000
    16.2 +++ b/src/SDL_error_c.h	Tue Feb 21 08:46:50 2006 +0000
    16.3 @@ -19,6 +19,7 @@
    16.4      Sam Lantinga
    16.5      slouken@libsdl.org
    16.6  */
    16.7 +#include "SDL_config.h"
    16.8  
    16.9  /* This file defines a structure that carries language-independent
   16.10     error messages
    17.1 --- a/src/SDL_fatal.c	Tue Feb 21 08:34:45 2006 +0000
    17.2 +++ b/src/SDL_fatal.c	Tue Feb 21 08:46:50 2006 +0000
    17.3 @@ -19,11 +19,10 @@
    17.4      Sam Lantinga
    17.5      slouken@libsdl.org
    17.6  */
    17.7 +#include "SDL_config.h"
    17.8  
    17.9  /* General fatal signal handling code for SDL */
   17.10  
   17.11 -#include "SDL_config.h"
   17.12 -
   17.13  #ifdef HAVE_SIGNAL_H
   17.14  
   17.15  #include <signal.h>
    18.1 --- a/src/SDL_fatal.h	Tue Feb 21 08:34:45 2006 +0000
    18.2 +++ b/src/SDL_fatal.h	Tue Feb 21 08:46:50 2006 +0000
    18.3 @@ -19,6 +19,7 @@
    18.4      Sam Lantinga
    18.5      slouken@libsdl.org
    18.6  */
    18.7 +#include "SDL_config.h"
    18.8  
    18.9  /* General fatal signal handling code for SDL */
   18.10  
    19.1 --- a/src/audio/SDL_audio.c	Tue Feb 21 08:34:45 2006 +0000
    19.2 +++ b/src/audio/SDL_audio.c	Tue Feb 21 08:46:50 2006 +0000
    19.3 @@ -19,6 +19,7 @@
    19.4      Sam Lantinga
    19.5      slouken@libsdl.org
    19.6  */
    19.7 +#include "SDL_config.h"
    19.8  
    19.9  /* Allow access to a raw mixing buffer */
   19.10  
   19.11 @@ -97,9 +98,6 @@
   19.12  #if SDL_AUDIO_DRIVER_DC
   19.13  	&DCAUD_bootstrap,
   19.14  #endif
   19.15 -#if SDL_AUDIO_DRIVER_DRENDERER
   19.16 -	&DRENDERER_bootstrap,
   19.17 -#endif
   19.18  #if SDL_AUDIO_DRIVER_MMEAUDIO
   19.19  	&MMEAUDIO_bootstrap,
   19.20  #endif
   19.21 @@ -114,7 +112,7 @@
   19.22  int SDL_AudioInit(const char *driver_name);
   19.23  void SDL_AudioQuit(void);
   19.24  
   19.25 -#ifdef ENABLE_AHI
   19.26 +#if SDL_AUDIO_DRIVER_AHI
   19.27  static int audio_configured = 0;
   19.28  #endif
   19.29  
   19.30 @@ -127,7 +125,7 @@
   19.31  	void  *udata;
   19.32  	void (*fill)(void *userdata,Uint8 *stream, int len);
   19.33  	int    silence;
   19.34 -#ifdef ENABLE_AHI
   19.35 +#if SDL_AUDIO_DRIVER_AHI
   19.36  	int started = 0;
   19.37  
   19.38  /* AmigaOS NEEDS that the audio driver is opened in the thread that uses it! */
   19.39 @@ -153,7 +151,7 @@
   19.40  	fill  = audio->spec.callback;
   19.41  	udata = audio->spec.userdata;
   19.42  
   19.43 -#ifdef ENABLE_AHI
   19.44 +#if SDL_AUDIO_DRIVER_AHI
   19.45  	audio_configured = 1;
   19.46  
   19.47  	D(bug("Audio configured... Checking for conversion\n"));
   19.48 @@ -174,7 +172,7 @@
   19.49  	}
   19.50  	stream = audio->fake_stream;
   19.51  
   19.52 -#ifdef ENABLE_AHI
   19.53 +#if SDL_AUDIO_DRIVER_AHI
   19.54  	SDL_mutexV(audio->mixer_lock);
   19.55  	D(bug("Entering audio loop...\n"));
   19.56  #endif
   19.57 @@ -197,7 +195,7 @@
   19.58  		if ( stream == audio->fake_stream ) {
   19.59  			SDL_Delay((audio->spec.samples*1000)/audio->spec.freq);
   19.60  		} else {
   19.61 -#ifdef ENABLE_AHI
   19.62 +#if SDL_AUDIO_DRIVER_AHI
   19.63  			if ( started > 1 )
   19.64  #endif
   19.65  			audio->WaitAudio(audio);
   19.66 @@ -238,7 +236,7 @@
   19.67  		/* Ready current buffer for play and change current buffer */
   19.68  		if ( stream != audio->fake_stream ) {
   19.69  			audio->PlayAudio(audio);
   19.70 -#ifdef ENABLE_AHI
   19.71 +#if SDL_AUDIO_DRIVER_AHI
   19.72  /* AmigaOS don't have to wait the first time audio is played! */
   19.73  			started++;
   19.74  #endif
   19.75 @@ -249,7 +247,7 @@
   19.76  		audio->WaitDone(audio);
   19.77  	}
   19.78  
   19.79 -#ifdef ENABLE_AHI
   19.80 +#if SDL_AUDIO_DRIVER_AHI
   19.81  	D(bug("WaitAudio...Done\n"));
   19.82  
   19.83  	audio->CloseAudio(audio);
   19.84 @@ -413,7 +411,7 @@
   19.85  		return(-1);
   19.86  	}
   19.87  
   19.88 -#if defined(macintosh) || (defined(__riscos__) && SDL_THREADS_DISABLED)
   19.89 +#if defined(__MACOS__) || (defined(__RISCOS__) && SDL_THREADS_DISABLED)
   19.90  	/* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */
   19.91  #else
   19.92  #if defined(__MINT__) && SDL_THREADS_DISABLED
   19.93 @@ -427,7 +425,7 @@
   19.94  		return(-1);
   19.95  	}
   19.96  #endif /* __MINT__ */
   19.97 -#endif /* macintosh */
   19.98 +#endif /* __MACOS__ */
   19.99  
  19.100  	/* Calculate the silence and size of the audio specification */
  19.101  	SDL_CalculateAudioSpec(desired);
  19.102 @@ -438,7 +436,7 @@
  19.103  	audio->enabled = 1;
  19.104  	audio->paused  = 1;
  19.105  
  19.106 -#ifndef ENABLE_AHI
  19.107 +#if SDL_AUDIO_DRIVER_AHI
  19.108  
  19.109  /* AmigaOS opens audio inside the main loop */
  19.110  	audio->opened = audio->OpenAudio(audio, &audio->spec)+1;
  19.111 @@ -450,8 +448,9 @@
  19.112  #else
  19.113  	D(bug("Locking semaphore..."));
  19.114  	SDL_mutexP(audio->mixer_lock);
  19.115 +#endif
  19.116  
  19.117 -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  19.118 +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  19.119  #undef SDL_CreateThread
  19.120  	audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL);
  19.121  #else
  19.122 @@ -466,6 +465,7 @@
  19.123  		return(-1);
  19.124  	}
  19.125  
  19.126 +#if SDL_AUDIO_DRIVER_AHI
  19.127  	while(!audio_configured)
  19.128  		SDL_Delay(100);
  19.129  #endif
  19.130 @@ -511,12 +511,12 @@
  19.131  		}
  19.132  	}
  19.133  
  19.134 -#ifndef ENABLE_AHI
  19.135 +#if SDL_AUDIO_DRIVER_AHI
  19.136  	/* Start the audio thread if necessary */
  19.137  	switch (audio->opened) {
  19.138  		case  1:
  19.139  			/* Start the audio thread */
  19.140 -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  19.141 +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  19.142  #undef SDL_CreateThread
  19.143  			audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL);
  19.144  #else
  19.145 @@ -611,7 +611,7 @@
  19.146  			SDL_FreeAudioMem(audio->convert.buf);
  19.147  
  19.148  		}
  19.149 -#ifndef ENABLE_AHI
  19.150 +#if SDL_AUDIO_DRIVER_AHI
  19.151  		if ( audio->opened ) {
  19.152  			audio->CloseAudio(audio);
  19.153  			audio->opened = 0;
    20.1 --- a/src/audio/SDL_audio_c.h	Tue Feb 21 08:34:45 2006 +0000
    20.2 +++ b/src/audio/SDL_audio_c.h	Tue Feb 21 08:46:50 2006 +0000
    20.3 @@ -19,6 +19,7 @@
    20.4      Sam Lantinga
    20.5      slouken@libsdl.org
    20.6  */
    20.7 +#include "SDL_config.h"
    20.8  
    20.9  /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */
   20.10  
    21.1 --- a/src/audio/SDL_audiocvt.c	Tue Feb 21 08:34:45 2006 +0000
    21.2 +++ b/src/audio/SDL_audiocvt.c	Tue Feb 21 08:46:50 2006 +0000
    21.3 @@ -19,6 +19,7 @@
    21.4      Sam Lantinga
    21.5      slouken@libsdl.org
    21.6  */
    21.7 +#include "SDL_config.h"
    21.8  
    21.9  /* Functions for audio drivers to perform runtime conversion of audio format */
   21.10  
    22.1 --- a/src/audio/SDL_audiodev.c	Tue Feb 21 08:34:45 2006 +0000
    22.2 +++ b/src/audio/SDL_audiodev.c	Tue Feb 21 08:46:50 2006 +0000
    22.3 @@ -19,10 +19,11 @@
    22.4      Sam Lantinga
    22.5      slouken@libsdl.org
    22.6  */
    22.7 +#include "SDL_config.h"
    22.8  
    22.9  /* Get the name of the audio device we use for output */
   22.10  
   22.11 -#if defined(unix) || defined(__unix__) || defined(__riscos__)
   22.12 +#if SDL_AUDIO_DRIVER_OPENBSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
   22.13  
   22.14  #include <fcntl.h>
   22.15  #include <sys/types.h>
   22.16 @@ -32,7 +33,7 @@
   22.17  #include "SDL_audiodev_c.h"
   22.18  
   22.19  #ifndef _PATH_DEV_DSP
   22.20 -#if defined(__NetBSD__) || defined(__OpenBSD__)
   22.21 +#if defined(__NETBSD__) || defined(__OPENBSD__)
   22.22  #define _PATH_DEV_DSP  "/dev/audio"
   22.23  #else
   22.24  #define _PATH_DEV_DSP  "/dev/dsp"
   22.25 @@ -95,7 +96,7 @@
   22.26  	return(audio_fd);
   22.27  }
   22.28  
   22.29 -#elif defined(_AIX)
   22.30 +#elif SDL_AUDIO_DRIVER_PAUD
   22.31  
   22.32  /* Get the name of the audio device we use for output */
   22.33  
   22.34 @@ -175,4 +176,4 @@
   22.35      return -1;
   22.36  }
   22.37  
   22.38 -#endif /* UNIX system */
   22.39 +#endif /* Audio driver selection */
    23.1 --- a/src/audio/SDL_audiodev_c.h	Tue Feb 21 08:34:45 2006 +0000
    23.2 +++ b/src/audio/SDL_audiodev_c.h	Tue Feb 21 08:46:50 2006 +0000
    23.3 @@ -19,6 +19,7 @@
    23.4      Sam Lantinga
    23.5      slouken@libsdl.org
    23.6  */
    23.7 +#include "SDL_config.h"
    23.8  
    23.9  /* Open the audio device, storing the pathname in 'path'  */
   23.10  extern int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic);
    24.1 --- a/src/audio/SDL_audiomem.h	Tue Feb 21 08:34:45 2006 +0000
    24.2 +++ b/src/audio/SDL_audiomem.h	Tue Feb 21 08:46:50 2006 +0000
    24.3 @@ -19,6 +19,7 @@
    24.4      Sam Lantinga
    24.5      slouken@libsdl.org
    24.6  */
    24.7 +#include "SDL_config.h"
    24.8  
    24.9  #define SDL_AllocAudioMem	SDL_malloc
   24.10  #define SDL_FreeAudioMem	SDL_free
    25.1 --- a/src/audio/SDL_mixer.c	Tue Feb 21 08:34:45 2006 +0000
    25.2 +++ b/src/audio/SDL_mixer.c	Tue Feb 21 08:46:50 2006 +0000
    25.3 @@ -19,6 +19,7 @@
    25.4      Sam Lantinga
    25.5      slouken@libsdl.org
    25.6  */
    25.7 +#include "SDL_config.h"
    25.8  
    25.9  /* This provides the default mixing callback for the SDL audio routines */
   25.10  
   25.11 @@ -110,7 +111,7 @@
   25.12  	switch (format) {
   25.13  
   25.14  		case AUDIO_U8: {
   25.15 -#if defined(__M68000__) && defined(__GNUC__)
   25.16 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.17  			SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8);
   25.18  #else
   25.19  			Uint8 src_sample;
   25.20 @@ -127,21 +128,21 @@
   25.21  		break;
   25.22  
   25.23  		case AUDIO_S8: {
   25.24 -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
   25.25 +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.26  			if (SDL_HasMMX())
   25.27  			{
   25.28  				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   25.29  			}
   25.30  			else
   25.31  #endif
   25.32 -#if defined(USE_ASM_MIXER_VC)
   25.33 +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
   25.34  			if (SDL_HasMMX())
   25.35  			{
   25.36  				SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   25.37  			}
   25.38  			else
   25.39  #endif
   25.40 -#if defined(__M68000__) && defined(__GNUC__)
   25.41 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.42  			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
   25.43  #else
   25.44  			{
   25.45 @@ -174,7 +175,7 @@
   25.46  		break;
   25.47  
   25.48  		case AUDIO_S16LSB: {
   25.49 -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
   25.50 +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.51  			if (SDL_HasMMX())
   25.52  			{
   25.53  				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   25.54 @@ -187,7 +188,7 @@
   25.55  			}
   25.56  			else
   25.57  #endif
   25.58 -#if defined(__M68000__) && defined(__GNUC__)
   25.59 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.60  			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
   25.61  #else
   25.62  			{
   25.63 @@ -220,7 +221,7 @@
   25.64  		break;
   25.65  
   25.66  		case AUDIO_S16MSB: {
   25.67 -#if defined(__M68000__) && defined(__GNUC__)
   25.68 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   25.69  			SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
   25.70  #else
   25.71  			Sint16 src1, src2;
    26.1 --- a/src/audio/SDL_mixer_MMX.c	Tue Feb 21 08:34:45 2006 +0000
    26.2 +++ b/src/audio/SDL_mixer_MMX.c	Tue Feb 21 08:46:50 2006 +0000
    26.3 @@ -1,3 +1,26 @@
    26.4 +/*
    26.5 +    SDL - Simple DirectMedia Layer
    26.6 +    Copyright (C) 1997-2006 Sam Lantinga
    26.7 +
    26.8 +    This library is free software; you can redistribute it and/or
    26.9 +    modify it under the terms of the GNU Lesser General Public
   26.10 +    License as published by the Free Software Foundation; either
   26.11 +    version 2.1 of the License, or (at your option) any later version.
   26.12 +
   26.13 +    This library is distributed in the hope that it will be useful,
   26.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   26.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   26.16 +    Lesser General Public License for more details.
   26.17 +
   26.18 +    You should have received a copy of the GNU Lesser General Public
   26.19 +    License along with this library; if not, write to the Free Software
   26.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   26.21 +
   26.22 +    Sam Lantinga
   26.23 +    slouken@libsdl.org
   26.24 +*/
   26.25 +#include "SDL_config.h"
   26.26 +
   26.27  /*
   26.28      MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
   26.29      Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
   26.30 @@ -12,7 +35,7 @@
   26.31  *   Mixing for 16 bit signed buffers
   26.32  ***********************************************/
   26.33  
   26.34 -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
   26.35 +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   26.36  void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
   26.37  {
   26.38      __asm__ __volatile__ (
    27.1 --- a/src/audio/SDL_mixer_MMX.h	Tue Feb 21 08:34:45 2006 +0000
    27.2 +++ b/src/audio/SDL_mixer_MMX.h	Tue Feb 21 08:46:50 2006 +0000
    27.3 @@ -6,6 +6,7 @@
    27.4      Assumes buffer size in bytes is a multiple of 16
    27.5      Assumes SDL_MIX_MAXVOLUME = 128
    27.6  */
    27.7 +#include "SDL_config.h"
    27.8  
    27.9  
   27.10  #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
    28.1 --- a/src/audio/SDL_mixer_MMX_VC.c	Tue Feb 21 08:34:45 2006 +0000
    28.2 +++ b/src/audio/SDL_mixer_MMX_VC.c	Tue Feb 21 08:46:50 2006 +0000
    28.3 @@ -1,7 +1,29 @@
    28.4 +/*
    28.5 +    SDL - Simple DirectMedia Layer
    28.6 +    Copyright (C) 1997-2006 Sam Lantinga
    28.7 +
    28.8 +    This library is free software; you can redistribute it and/or
    28.9 +    modify it under the terms of the GNU Lesser General Public
   28.10 +    License as published by the Free Software Foundation; either
   28.11 +    version 2.1 of the License, or (at your option) any later version.
   28.12 +
   28.13 +    This library is distributed in the hope that it will be useful,
   28.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   28.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   28.16 +    Lesser General Public License for more details.
   28.17 +
   28.18 +    You should have received a copy of the GNU Lesser General Public
   28.19 +    License along with this library; if not, write to the Free Software
   28.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   28.21 +
   28.22 +    Sam Lantinga
   28.23 +    slouken@libsdl.org
   28.24 +*/
   28.25 +#include "SDL_config.h"
   28.26  
   28.27  #include "SDL_mixer_MMX_VC.h"
   28.28  
   28.29 -#if defined(USE_ASM_MIXER_VC)
   28.30 +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
   28.31  // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
   28.32  // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
   28.33  // Converted to Intel ASM notation by Cth
   28.34 @@ -156,4 +178,4 @@
   28.35  	}
   28.36  }
   28.37  
   28.38 -#endif /* USE_ASM_MIXER_VC */
   28.39 +#endif /* SDL_ASSEMBLY_ROUTINES */
    29.1 --- a/src/audio/SDL_mixer_MMX_VC.h	Tue Feb 21 08:34:45 2006 +0000
    29.2 +++ b/src/audio/SDL_mixer_MMX_VC.h	Tue Feb 21 08:46:50 2006 +0000
    29.3 @@ -1,7 +1,27 @@
    29.4 -#ifdef _MSC_VER
    29.5 -#define USE_ASM_MIXER_VC
    29.6 -#endif
    29.7 -#if defined(USE_ASM_MIXER_VC)
    29.8 +/*
    29.9 +    SDL - Simple DirectMedia Layer
   29.10 +    Copyright (C) 1997-2006 Sam Lantinga
   29.11 +
   29.12 +    This library is free software; you can redistribute it and/or
   29.13 +    modify it under the terms of the GNU Lesser General Public
   29.14 +    License as published by the Free Software Foundation; either
   29.15 +    version 2.1 of the License, or (at your option) any later version.
   29.16 +
   29.17 +    This library is distributed in the hope that it will be useful,
   29.18 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   29.19 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   29.20 +    Lesser General Public License for more details.
   29.21 +
   29.22 +    You should have received a copy of the GNU Lesser General Public
   29.23 +    License along with this library; if not, write to the Free Software
   29.24 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   29.25 +
   29.26 +    Sam Lantinga
   29.27 +    slouken@libsdl.org
   29.28 +*/
   29.29 +#include "SDL_config.h"
   29.30 +
   29.31 +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
   29.32  // headers for MMX assembler version of SDL_MixAudio
   29.33  // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
   29.34  // Converted to Intel ASM notation by Cth
    30.1 --- a/src/audio/SDL_mixer_m68k.c	Tue Feb 21 08:34:45 2006 +0000
    30.2 +++ b/src/audio/SDL_mixer_m68k.c	Tue Feb 21 08:46:50 2006 +0000
    30.3 @@ -19,6 +19,7 @@
    30.4      Sam Lantinga
    30.5      slouken@libsdl.org
    30.6  */
    30.7 +#include "SDL_config.h"
    30.8  
    30.9  /*
   30.10  	m68k assembly mix routines
    31.1 --- a/src/audio/SDL_mixer_m68k.h	Tue Feb 21 08:34:45 2006 +0000
    31.2 +++ b/src/audio/SDL_mixer_m68k.h	Tue Feb 21 08:46:50 2006 +0000
    31.3 @@ -19,6 +19,7 @@
    31.4      Sam Lantinga
    31.5      slouken@libsdl.org
    31.6  */
    31.7 +#include "SDL_config.h"
    31.8  
    31.9  /*
   31.10  	m68k assembly mix routines
    32.1 --- a/src/audio/SDL_sysaudio.h	Tue Feb 21 08:34:45 2006 +0000
    32.2 +++ b/src/audio/SDL_sysaudio.h	Tue Feb 21 08:46:50 2006 +0000
    32.3 @@ -19,6 +19,7 @@
    32.4      Sam Lantinga
    32.5      slouken@libsdl.org
    32.6  */
    32.7 +#include "SDL_config.h"
    32.8  
    32.9  #ifndef _SDL_sysaudio_h
   32.10  #define _SDL_sysaudio_h
   32.11 @@ -161,9 +162,6 @@
   32.12  #if SDL_AUDIO_DRIVER_DC
   32.13  extern AudioBootStrap DCAUD_bootstrap;
   32.14  #endif
   32.15 -#if SDL_AUDIO_DRIVER_DRENDERER
   32.16 -extern AudioBootStrap DRENDERER_bootstrap;
   32.17 -#endif
   32.18  #if SDL_AUDIO_DRIVER_MMEAUDIO
   32.19  extern AudioBootStrap MMEAUDIO_bootstrap;
   32.20  #endif
    33.1 --- a/src/audio/SDL_wave.c	Tue Feb 21 08:34:45 2006 +0000
    33.2 +++ b/src/audio/SDL_wave.c	Tue Feb 21 08:46:50 2006 +0000
    33.3 @@ -19,6 +19,7 @@
    33.4      Sam Lantinga
    33.5      slouken@libsdl.org
    33.6  */
    33.7 +#include "SDL_config.h"
    33.8  
    33.9  /* Microsoft WAVE file loading routines */
   33.10  
    34.1 --- a/src/audio/SDL_wave.h	Tue Feb 21 08:34:45 2006 +0000
    34.2 +++ b/src/audio/SDL_wave.h	Tue Feb 21 08:46:50 2006 +0000
    34.3 @@ -19,6 +19,7 @@
    34.4      Sam Lantinga
    34.5      slouken@libsdl.org
    34.6  */
    34.7 +#include "SDL_config.h"
    34.8  
    34.9  /* WAVE files are little-endian */
   34.10  
    35.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Tue Feb 21 08:34:45 2006 +0000
    35.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Tue Feb 21 08:46:50 2006 +0000
    35.3 @@ -19,8 +19,7 @@
    35.4      Sam Lantinga
    35.5      slouken@libsdl.org
    35.6  */
    35.7 -
    35.8 -
    35.9 +#include "SDL_config.h"
   35.10  
   35.11  /* Allow access to a raw mixing buffer */
   35.12  
    36.1 --- a/src/audio/alsa/SDL_alsa_audio.h	Tue Feb 21 08:34:45 2006 +0000
    36.2 +++ b/src/audio/alsa/SDL_alsa_audio.h	Tue Feb 21 08:46:50 2006 +0000
    36.3 @@ -19,6 +19,7 @@
    36.4      Sam Lantinga
    36.5      slouken@libsdl.org
    36.6  */
    36.7 +#include "SDL_config.h"
    36.8  
    36.9  #ifndef _ALSA_PCM_audio_h
   36.10  #define _ALSA_PCM_audio_h
    37.1 --- a/src/audio/amigaos/SDL_ahiaudio.c	Tue Feb 21 08:34:45 2006 +0000
    37.2 +++ b/src/audio/amigaos/SDL_ahiaudio.c	Tue Feb 21 08:46:50 2006 +0000
    37.3 @@ -19,6 +19,7 @@
    37.4      Sam Lantinga
    37.5      slouken@libsdl.org
    37.6  */
    37.7 +#include "SDL_config.h"
    37.8  
    37.9  /* Allow access to a raw mixing buffer (for AmigaOS) */
   37.10  
    38.1 --- a/src/audio/amigaos/SDL_ahiaudio.h	Tue Feb 21 08:34:45 2006 +0000
    38.2 +++ b/src/audio/amigaos/SDL_ahiaudio.h	Tue Feb 21 08:46:50 2006 +0000
    38.3 @@ -19,6 +19,7 @@
    38.4      Sam Lantinga
    38.5      slouken@libsdl.org
    38.6  */
    38.7 +#include "SDL_config.h"
    38.8  
    38.9  #ifndef _SDL_ahiaudio_h
   38.10  #define _SDL_ahiaudio_h
    39.1 --- a/src/audio/arts/SDL_artsaudio.c	Tue Feb 21 08:34:45 2006 +0000
    39.2 +++ b/src/audio/arts/SDL_artsaudio.c	Tue Feb 21 08:46:50 2006 +0000
    39.3 @@ -19,6 +19,7 @@
    39.4      Sam Lantinga
    39.5      slouken@libsdl.org
    39.6  */
    39.7 +#include "SDL_config.h"
    39.8  
    39.9  /* Allow access to a raw mixing buffer */
   39.10  
    40.1 --- a/src/audio/arts/SDL_artsaudio.h	Tue Feb 21 08:34:45 2006 +0000
    40.2 +++ b/src/audio/arts/SDL_artsaudio.h	Tue Feb 21 08:46:50 2006 +0000
    40.3 @@ -19,6 +19,7 @@
    40.4      Sam Lantinga
    40.5      slouken@libsdl.org
    40.6  */
    40.7 +#include "SDL_config.h"
    40.8  
    40.9  #ifndef _SDL_artscaudio_h
   40.10  #define _SDL_artscaudio_h
    41.1 --- a/src/audio/baudio/SDL_beaudio.h	Tue Feb 21 08:34:45 2006 +0000
    41.2 +++ b/src/audio/baudio/SDL_beaudio.h	Tue Feb 21 08:46:50 2006 +0000
    41.3 @@ -19,6 +19,7 @@
    41.4      Sam Lantinga
    41.5      slouken@libsdl.org
    41.6  */
    41.7 +#include "SDL_config.h"
    41.8  
    41.9  #ifndef _SDL_lowaudio_h
   41.10  #define _SDL_lowaudio_h
    42.1 --- a/src/audio/dart/SDL_dart.c	Tue Feb 21 08:34:45 2006 +0000
    42.2 +++ b/src/audio/dart/SDL_dart.c	Tue Feb 21 08:46:50 2006 +0000
    42.3 @@ -19,6 +19,7 @@
    42.4      Sam Lantinga
    42.5      slouken@libsdl.org
    42.6  */
    42.7 +#include "SDL_config.h"
    42.8  
    42.9  /* Allow access to a raw mixing buffer */
   42.10  
    43.1 --- a/src/audio/dart/SDL_dart.h	Tue Feb 21 08:34:45 2006 +0000
    43.2 +++ b/src/audio/dart/SDL_dart.h	Tue Feb 21 08:46:50 2006 +0000
    43.3 @@ -19,6 +19,7 @@
    43.4      Sam Lantinga
    43.5      slouken@libsdl.org
    43.6  */
    43.7 +#include "SDL_config.h"
    43.8  
    43.9  #ifndef _SDL_lowaudio_h
   43.10  #define _SDL_lowaudio_h
    44.1 --- a/src/audio/dc/SDL_dcaudio.c	Tue Feb 21 08:34:45 2006 +0000
    44.2 +++ b/src/audio/dc/SDL_dcaudio.c	Tue Feb 21 08:46:50 2006 +0000
    44.3 @@ -20,6 +20,7 @@
    44.4      slouken@libsdl.org
    44.5  
    44.6  */
    44.7 +#include "SDL_config.h"
    44.8  
    44.9  /* Output dreamcast aica */
   44.10  
    45.1 --- a/src/audio/dc/SDL_dcaudio.h	Tue Feb 21 08:34:45 2006 +0000
    45.2 +++ b/src/audio/dc/SDL_dcaudio.h	Tue Feb 21 08:46:50 2006 +0000
    45.3 @@ -19,6 +19,7 @@
    45.4      Sam Lantinga
    45.5      slouken@libsdl.org
    45.6  */
    45.7 +#include "SDL_config.h"
    45.8  
    45.9  #ifndef _SDL_diskaudio_h
   45.10  #define _SDL_diskaudio_h
    46.1 --- a/src/audio/dc/aica.h	Tue Feb 21 08:34:45 2006 +0000
    46.2 +++ b/src/audio/dc/aica.h	Tue Feb 21 08:46:50 2006 +0000
    46.3 @@ -1,3 +1,26 @@
    46.4 +/*
    46.5 +    SDL - Simple DirectMedia Layer
    46.6 +    Copyright (C) 1997-2006 Sam Lantinga
    46.7 +
    46.8 +    This library is free software; you can redistribute it and/or
    46.9 +    modify it under the terms of the GNU Lesser General Public
   46.10 +    License as published by the Free Software Foundation; either
   46.11 +    version 2.1 of the License, or (at your option) any later version.
   46.12 +
   46.13 +    This library is distributed in the hope that it will be useful,
   46.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   46.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   46.16 +    Lesser General Public License for more details.
   46.17 +
   46.18 +    You should have received a copy of the GNU Lesser General Public
   46.19 +    License along with this library; if not, write to the Free Software
   46.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   46.21 +
   46.22 +    Sam Lantinga
   46.23 +    slouken@libsdl.org
   46.24 +*/
   46.25 +#include "SDL_config.h"
   46.26 +
   46.27  #ifndef _AICA_H_
   46.28  #define _AICA_H_
   46.29  
    47.1 --- a/src/audio/disk/SDL_diskaudio.c	Tue Feb 21 08:34:45 2006 +0000
    47.2 +++ b/src/audio/disk/SDL_diskaudio.c	Tue Feb 21 08:46:50 2006 +0000
    47.3 @@ -22,6 +22,7 @@
    47.4      This file hacked^H^H^H^H^H^Hwritten by Ryan C. Gordon
    47.5          (icculus@linuxgames.com)
    47.6  */
    47.7 +#include "SDL_config.h"
    47.8  
    47.9  /* Output raw audio data to a file. */
   47.10  
    48.1 --- a/src/audio/disk/SDL_diskaudio.h	Tue Feb 21 08:34:45 2006 +0000
    48.2 +++ b/src/audio/disk/SDL_diskaudio.h	Tue Feb 21 08:46:50 2006 +0000
    48.3 @@ -19,6 +19,7 @@
    48.4      Sam Lantinga
    48.5      slouken@libsdl.org
    48.6  */
    48.7 +#include "SDL_config.h"
    48.8  
    48.9  #ifndef _SDL_diskaudio_h
   48.10  #define _SDL_diskaudio_h
    49.1 --- a/src/audio/dma/SDL_dmaaudio.c	Tue Feb 21 08:34:45 2006 +0000
    49.2 +++ b/src/audio/dma/SDL_dmaaudio.c	Tue Feb 21 08:46:50 2006 +0000
    49.3 @@ -19,6 +19,7 @@
    49.4      Sam Lantinga
    49.5      slouken@libsdl.org
    49.6  */
    49.7 +#include "SDL_config.h"
    49.8  
    49.9  /* Allow access to a raw mixing buffer */
   49.10  
   49.11 @@ -34,8 +35,6 @@
   49.12  #include <sys/stat.h>
   49.13  #include <sys/mman.h>
   49.14  
   49.15 -#include "SDL_config.h"
   49.16 -
   49.17  #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
   49.18  /* This is installed on some systems */
   49.19  #include <soundcard.h>
    50.1 --- a/src/audio/dma/SDL_dmaaudio.h	Tue Feb 21 08:34:45 2006 +0000
    50.2 +++ b/src/audio/dma/SDL_dmaaudio.h	Tue Feb 21 08:46:50 2006 +0000
    50.3 @@ -19,6 +19,7 @@
    50.4      Sam Lantinga
    50.5      slouken@libsdl.org
    50.6  */
    50.7 +#include "SDL_config.h"
    50.8  
    50.9  #ifndef _SDL_dspaudio_h
   50.10  #define _SDL_dspaudio_h
    51.1 --- a/src/audio/dmedia/SDL_irixaudio.c	Tue Feb 21 08:34:45 2006 +0000
    51.2 +++ b/src/audio/dmedia/SDL_irixaudio.c	Tue Feb 21 08:46:50 2006 +0000
    51.3 @@ -19,6 +19,7 @@
    51.4      Sam Lantinga
    51.5      slouken@libsdl.org
    51.6  */
    51.7 +#include "SDL_config.h"
    51.8  
    51.9  /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
   51.10  /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */
    52.1 --- a/src/audio/dmedia/SDL_irixaudio.h	Tue Feb 21 08:34:45 2006 +0000
    52.2 +++ b/src/audio/dmedia/SDL_irixaudio.h	Tue Feb 21 08:46:50 2006 +0000
    52.3 @@ -19,6 +19,7 @@
    52.4      Sam Lantinga
    52.5      slouken@libsdl.org
    52.6  */
    52.7 +#include "SDL_config.h"
    52.8  
    52.9  #ifndef _SDL_lowaudio_h
   52.10  #define _SDL_lowaudio_h
    53.1 --- a/src/audio/dsp/SDL_dspaudio.c	Tue Feb 21 08:34:45 2006 +0000
    53.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Tue Feb 21 08:46:50 2006 +0000
    53.3 @@ -22,6 +22,7 @@
    53.4      Modified in Oct 2004 by Hannu Savolainen 
    53.5      hannu@opensound.com
    53.6  */
    53.7 +#include "SDL_config.h"
    53.8  
    53.9  /* Allow access to a raw mixing buffer */
   53.10  
   53.11 @@ -35,8 +36,6 @@
   53.12  #include <sys/ioctl.h>
   53.13  #include <sys/stat.h>
   53.14  
   53.15 -#include "SDL_config.h"
   53.16 -
   53.17  #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
   53.18  /* This is installed on some systems */
   53.19  #include <soundcard.h>
    54.1 --- a/src/audio/dsp/SDL_dspaudio.h	Tue Feb 21 08:34:45 2006 +0000
    54.2 +++ b/src/audio/dsp/SDL_dspaudio.h	Tue Feb 21 08:46:50 2006 +0000
    54.3 @@ -19,6 +19,7 @@
    54.4      Sam Lantinga
    54.5      slouken@libsdl.org
    54.6  */
    54.7 +#include "SDL_config.h"
    54.8  
    54.9  #ifndef _SDL_dspaudio_h
   54.10  #define _SDL_dspaudio_h
    55.1 --- a/src/audio/esd/SDL_esdaudio.c	Tue Feb 21 08:34:45 2006 +0000
    55.2 +++ b/src/audio/esd/SDL_esdaudio.c	Tue Feb 21 08:46:50 2006 +0000
    55.3 @@ -19,6 +19,7 @@
    55.4      Sam Lantinga
    55.5      slouken@libsdl.org
    55.6  */
    55.7 +#include "SDL_config.h"
    55.8  
    55.9  /* Allow access to an ESD network stream mixing buffer */
   55.10  
   55.11 @@ -244,7 +245,7 @@
   55.12  static char *get_progname(void)
   55.13  {
   55.14  	char *progname = NULL;
   55.15 -#ifdef linux
   55.16 +#ifdef __LINUX__
   55.17  	FILE *fp;
   55.18  	static char temp[BUFSIZ];
   55.19  
    56.1 --- a/src/audio/esd/SDL_esdaudio.h	Tue Feb 21 08:34:45 2006 +0000
    56.2 +++ b/src/audio/esd/SDL_esdaudio.h	Tue Feb 21 08:46:50 2006 +0000
    56.3 @@ -19,6 +19,7 @@
    56.4      Sam Lantinga
    56.5      slouken@libsdl.org
    56.6  */
    56.7 +#include "SDL_config.h"
    56.8  
    56.9  #ifndef _SDL_esdaudio_h
   56.10  #define _SDL_esdaudio_h
    57.1 --- a/src/audio/macosx/SDL_coreaudio.c	Tue Feb 21 08:34:45 2006 +0000
    57.2 +++ b/src/audio/macosx/SDL_coreaudio.c	Tue Feb 21 08:46:50 2006 +0000
    57.3 @@ -19,6 +19,7 @@
    57.4      Sam Lantinga
    57.5      slouken@libsdl.org
    57.6  */
    57.7 +#include "SDL_config.h"
    57.8  
    57.9  #include <AudioUnit/AudioUnit.h>
   57.10  
    58.1 --- a/src/audio/macosx/SDL_coreaudio.h	Tue Feb 21 08:34:45 2006 +0000
    58.2 +++ b/src/audio/macosx/SDL_coreaudio.h	Tue Feb 21 08:46:50 2006 +0000
    58.3 @@ -19,6 +19,7 @@
    58.4      Sam Lantinga
    58.5      slouken@libsdl.org
    58.6  */
    58.7 +#include "SDL_config.h"
    58.8  
    58.9  #ifndef _SDL_coreaudio_h
   58.10  #define _SDL_coreaudio_h
    59.1 --- a/src/audio/macrom/SDL_romaudio.c	Tue Feb 21 08:34:45 2006 +0000
    59.2 +++ b/src/audio/macrom/SDL_romaudio.c	Tue Feb 21 08:46:50 2006 +0000
    59.3 @@ -19,6 +19,7 @@
    59.4      Sam Lantinga
    59.5      slouken@libsdl.org
    59.6  */
    59.7 +#include "SDL_config.h"
    59.8  
    59.9  #if defined(__APPLE__) && defined(__MACH__)
   59.10  #  include <Carbon/Carbon.h>
   59.11 @@ -92,7 +93,7 @@
   59.12      this->UnlockAudio = Mac_UnlockAudio;
   59.13      this->free        = Audio_DeleteDevice;
   59.14  
   59.15 -#ifdef MACOSX	/* MacOS X uses threaded audio, so normal thread code is okay */
   59.16 +#ifdef __MACOSX__	/* MacOS X uses threaded audio, so normal thread code is okay */
   59.17      this->LockAudio   = NULL;
   59.18      this->UnlockAudio = NULL;
   59.19  #endif
   59.20 @@ -120,7 +121,7 @@
   59.21  static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer)
   59.22  {
   59.23     if ( ! audio->paused ) {
   59.24 -#ifdef MACOSX
   59.25 +#ifdef __MACOSX__
   59.26          SDL_mutexP(audio->mixer_lock);
   59.27  #endif
   59.28          if ( audio->convert.needed ) {
   59.29 @@ -134,7 +135,7 @@
   59.30          } else {
   59.31              audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size);
   59.32          }
   59.33 -#ifdef MACOSX
   59.34 +#ifdef __MACOSX__
   59.35          SDL_mutexV(audio->mixer_lock);
   59.36  #endif
   59.37      }
    60.1 --- a/src/audio/macrom/SDL_romaudio.h	Tue Feb 21 08:34:45 2006 +0000
    60.2 +++ b/src/audio/macrom/SDL_romaudio.h	Tue Feb 21 08:46:50 2006 +0000
    60.3 @@ -19,6 +19,7 @@
    60.4      Sam Lantinga
    60.5      slouken@libsdl.org
    60.6  */
    60.7 +#include "SDL_config.h"
    60.8  
    60.9  #ifndef _SDL_romaudio_h
   60.10  #define _SDL_romaudio_h
    61.1 --- a/src/audio/mint/SDL_mintaudio.c	Tue Feb 21 08:34:45 2006 +0000
    61.2 +++ b/src/audio/mint/SDL_mintaudio.c	Tue Feb 21 08:46:50 2006 +0000
    61.3 @@ -19,6 +19,7 @@
    61.4      Sam Lantinga
    61.5      slouken@libsdl.org
    61.6  */
    61.7 +#include "SDL_config.h"
    61.8  
    61.9  /*
   61.10  	Audio interrupt variables and callback function
    62.1 --- a/src/audio/mint/SDL_mintaudio.h	Tue Feb 21 08:34:45 2006 +0000
    62.2 +++ b/src/audio/mint/SDL_mintaudio.h	Tue Feb 21 08:46:50 2006 +0000
    62.3 @@ -19,6 +19,7 @@
    62.4      Sam Lantinga
    62.5      slouken@libsdl.org
    62.6  */
    62.7 +#include "SDL_config.h"
    62.8  
    62.9  /*
   62.10  	MiNT audio driver
    63.1 --- a/src/audio/mint/SDL_mintaudio_dma8.c	Tue Feb 21 08:34:45 2006 +0000
    63.2 +++ b/src/audio/mint/SDL_mintaudio_dma8.c	Tue Feb 21 08:46:50 2006 +0000
    63.3 @@ -19,6 +19,7 @@
    63.4      Sam Lantinga
    63.5      slouken@libsdl.org
    63.6  */
    63.7 +#include "SDL_config.h"
    63.8  
    63.9  /*
   63.10  	MiNT audio driver
    64.1 --- a/src/audio/mint/SDL_mintaudio_dma8.h	Tue Feb 21 08:34:45 2006 +0000
    64.2 +++ b/src/audio/mint/SDL_mintaudio_dma8.h	Tue Feb 21 08:46:50 2006 +0000
    64.3 @@ -19,6 +19,7 @@
    64.4      Sam Lantinga
    64.5      slouken@libsdl.org
    64.6  */
    64.7 +#include "SDL_config.h"
    64.8  
    64.9  /*
   64.10  	DMA 8bits and Falcon Codec audio definitions
    65.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.c	Tue Feb 21 08:34:45 2006 +0000
    65.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Tue Feb 21 08:46:50 2006 +0000
    65.3 @@ -19,6 +19,7 @@
    65.4      Sam Lantinga
    65.5      slouken@libsdl.org
    65.6  */
    65.7 +#include "SDL_config.h"
    65.8  
    65.9  /*
   65.10  	MiNT audio driver
    66.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.h	Tue Feb 21 08:34:45 2006 +0000
    66.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.h	Tue Feb 21 08:46:50 2006 +0000
    66.3 @@ -1,3 +1,26 @@
    66.4 +/*
    66.5 +    SDL - Simple DirectMedia Layer
    66.6 +    Copyright (C) 1997-2006 Sam Lantinga
    66.7 +
    66.8 +    This library is free software; you can redistribute it and/or
    66.9 +    modify it under the terms of the GNU Lesser General Public
   66.10 +    License as published by the Free Software Foundation; either
   66.11 +    version 2.1 of the License, or (at your option) any later version.
   66.12 +
   66.13 +    This library is distributed in the hope that it will be useful,
   66.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
   66.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   66.16 +    Lesser General Public License for more details.
   66.17 +
   66.18 +    You should have received a copy of the GNU Lesser General Public
   66.19 +    License along with this library; if not, write to the Free Software
   66.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   66.21 +
   66.22 +    Sam Lantinga
   66.23 +    slouken@libsdl.org
   66.24 +*/
   66.25 +#include "SDL_config.h"
   66.26 +
   66.27  /*
   66.28   * GSXB audio definitions
   66.29   * 
    67.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.c	Tue Feb 21 08:34:45 2006 +0000
    67.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Tue Feb 21 08:46:50 2006 +0000
    67.3 @@ -19,6 +19,7 @@
    67.4      Sam Lantinga
    67.5      slouken@libsdl.org
    67.6  */
    67.7 +#include "SDL_config.h"
    67.8  
    67.9  /*
   67.10  	MiNT audio driver
    68.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.h	Tue Feb 21 08:34:45 2006 +0000
    68.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.h	Tue Feb 21 08:46:50 2006 +0000
    68.3 @@ -19,6 +19,7 @@
    68.4      Sam Lantinga
    68.5      slouken@libsdl.org
    68.6  */
    68.7 +#include "SDL_config.h"
    68.8  
    68.9  /*
   68.10  	MCSN control structure
    69.1 --- a/src/audio/mint/SDL_mintaudio_stfa.c	Tue Feb 21 08:34:45 2006 +0000
    69.2 +++ b/src/audio/mint/SDL_mintaudio_stfa.c	Tue Feb 21 08:46:50 2006 +0000
    69.3 @@ -19,6 +19,7 @@
    69.4      Sam Lantinga
    69.5      slouken@libsdl.org
    69.6  */
    69.7 +#include "SDL_config.h"
    69.8  
    69.9  /*
   69.10  	MiNT audio driver
    70.1 --- a/src/audio/mint/SDL_mintaudio_stfa.h	Tue Feb 21 08:34:45 2006 +0000
    70.2 +++ b/src/audio/mint/SDL_mintaudio_stfa.h	Tue Feb 21 08:46:50 2006 +0000
    70.3 @@ -19,6 +19,7 @@
    70.4      Sam Lantinga
    70.5      slouken@libsdl.org
    70.6  */
    70.7 +#include "SDL_config.h"
    70.8  
    70.9  /*
   70.10  	STFA control structure
    71.1 --- a/src/audio/mint/SDL_mintaudio_xbios.c	Tue Feb 21 08:34:45 2006 +0000
    71.2 +++ b/src/audio/mint/SDL_mintaudio_xbios.c	Tue Feb 21 08:46:50 2006 +0000
    71.3 @@ -19,6 +19,7 @@
    71.4      Sam Lantinga
    71.5      slouken@libsdl.org
    71.6  */
    71.7 +#include "SDL_config.h"
    71.8  
    71.9  /*
   71.10  	MiNT audio driver
    72.1 --- a/src/audio/mme/SDL_mmeaudio.c	Tue Feb 21 08:34:45 2006 +0000
    72.2 +++ b/src/audio/mme/SDL_mmeaudio.c	Tue Feb 21 08:46:50 2006 +0000
    72.3 @@ -19,6 +19,7 @@
    72.4      Sam Lantinga
    72.5      slouken@libsdl.org
    72.6  */
    72.7 +#include "SDL_config.h"
    72.8  
    72.9  /* Tru64 UNIX MME support */
   72.10  #include <mme_api.h>
    73.1 --- a/src/audio/mme/SDL_mmeaudio.h	Tue Feb 21 08:34:45 2006 +0000
    73.2 +++ b/src/audio/mme/SDL_mmeaudio.h	Tue Feb 21 08:46:50 2006 +0000
    73.3 @@ -19,6 +19,7 @@
    73.4      Sam Lantinga
    73.5      slouken@libsdl.org
    73.6  */
    73.7 +#include "SDL_config.h"
    73.8  
    73.9  /* Allow access to a raw mixing buffer */
   73.10  
    74.1 --- a/src/audio/nas/SDL_nasaudio.c	Tue Feb 21 08:34:45 2006 +0000
    74.2 +++ b/src/audio/nas/SDL_nasaudio.c	Tue Feb 21 08:46:50 2006 +0000
    74.3 @@ -23,6 +23,7 @@
    74.4      Erik Inge Bols°
    74.5      knan@mo.himolde.no
    74.6  */
    74.7 +#include "SDL_config.h"
    74.8  
    74.9  /* Allow access to a raw mixing buffer */
   74.10  
    75.1 --- a/src/audio/nas/SDL_nasaudio.h	Tue Feb 21 08:34:45 2006 +0000
    75.2 +++ b/src/audio/nas/SDL_nasaudio.h	Tue Feb 21 08:46:50 2006 +0000
    75.3 @@ -23,6 +23,7 @@
    75.4      Erik Inge Bols°
    75.5      knan@mo.himolde.no
    75.6  */
    75.7 +#include "SDL_config.h"
    75.8  
    75.9  #ifndef _SDL_nasaudio_h
   75.10  #define _SDL_nasaudio_h
    76.1 --- a/src/audio/nto/SDL_nto_audio.c	Tue Feb 21 08:34:45 2006 +0000
    76.2 +++ b/src/audio/nto/SDL_nto_audio.c	Tue Feb 21 08:46:50 2006 +0000
    76.3 @@ -19,6 +19,7 @@
    76.4      Sam Lantinga
    76.5      slouken@libsdl.org
    76.6  */
    76.7 +#include "SDL_config.h"
    76.8  
    76.9  #include <errno.h>
   76.10  #include <unistd.h>
    77.1 --- a/src/audio/nto/SDL_nto_audio.h	Tue Feb 21 08:34:45 2006 +0000
    77.2 +++ b/src/audio/nto/SDL_nto_audio.h	Tue Feb 21 08:46:50 2006 +0000
    77.3 @@ -19,6 +19,7 @@
    77.4      Sam Lantinga
    77.5      slouken@libsdl.org
    77.6  */
    77.7 +#include "SDL_config.h"
    77.8  
    77.9  #ifndef __SDL_NTO_AUDIO_H__
   77.10  #define __SDL_NTO_AUDIO_H__
    78.1 --- a/src/audio/openbsd/SDL_openbsdaudio.c	Tue Feb 21 08:34:45 2006 +0000
    78.2 +++ b/src/audio/openbsd/SDL_openbsdaudio.c	Tue Feb 21 08:46:50 2006 +0000
    78.3 @@ -19,6 +19,7 @@
    78.4      Sam Lantinga
    78.5      slouken@libsdl.org
    78.6  */
    78.7 +#include "SDL_config.h"
    78.8  
    78.9  /*
   78.10   * Driver for native OpenBSD audio(4).
    79.1 --- a/src/audio/openbsd/SDL_openbsdaudio.h	Tue Feb 21 08:34:45 2006 +0000
    79.2 +++ b/src/audio/openbsd/SDL_openbsdaudio.h	Tue Feb 21 08:46:50 2006 +0000
    79.3 @@ -19,6 +19,7 @@
    79.4      Sam Lantinga
    79.5      slouken@libsdl.org
    79.6  */
    79.7 +#include "SDL_config.h"
    79.8  
    79.9  #ifndef _SDL_openbsdaudio_h
   79.10  #define _SDL_openbsdaudio_h
    80.1 --- a/src/audio/paudio/SDL_paudio.c	Tue Feb 21 08:34:45 2006 +0000
    80.2 +++ b/src/audio/paudio/SDL_paudio.c	Tue Feb 21 08:46:50 2006 +0000
    80.3 @@ -21,6 +21,7 @@
    80.4  
    80.5      based on linux/SDL_dspaudio.c by Sam Lantinga
    80.6  */
    80.7 +#include "SDL_config.h"
    80.8  
    80.9  /* Allow access to a raw mixing buffer */
   80.10  
    81.1 --- a/src/audio/paudio/SDL_paudio.h	Tue Feb 21 08:34:45 2006 +0000
    81.2 +++ b/src/audio/paudio/SDL_paudio.h	Tue Feb 21 08:46:50 2006 +0000
    81.3 @@ -19,6 +19,7 @@
    81.4      Sam Lantinga
    81.5      slouken@libsdl.org
    81.6  */
    81.7 +#include "SDL_config.h"
    81.8  
    81.9  #ifndef _SDL_paudaudio_h
   81.10  #define _SDL_paudaudio_h
    82.1 --- a/src/audio/sun/SDL_sunaudio.c	Tue Feb 21 08:34:45 2006 +0000
    82.2 +++ b/src/audio/sun/SDL_sunaudio.c	Tue Feb 21 08:46:50 2006 +0000
    82.3 @@ -19,12 +19,13 @@
    82.4      Sam Lantinga
    82.5      slouken@libsdl.org
    82.6  */
    82.7 +#include "SDL_config.h"
    82.8  
    82.9  /* Allow access to a raw mixing buffer */
   82.10  
   82.11  #include <fcntl.h>
   82.12  #include <errno.h>
   82.13 -#ifdef __NetBSD__
   82.14 +#ifdef __NETBSD__
   82.15  #include <sys/ioctl.h>
   82.16  #include <sys/audioio.h>
   82.17  #endif
    83.1 --- a/src/audio/sun/SDL_sunaudio.h	Tue Feb 21 08:34:45 2006 +0000
    83.2 +++ b/src/audio/sun/SDL_sunaudio.h	Tue Feb 21 08:46:50 2006 +0000
    83.3 @@ -19,6 +19,7 @@
    83.4      Sam Lantinga
    83.5      slouken@libsdl.org
    83.6  */
    83.7 +#include "SDL_config.h"
    83.8  
    83.9  #ifndef _SDL_lowaudio_h
   83.10  #define _SDL_lowaudio_h
    84.1 --- a/src/audio/ums/SDL_umsaudio.c	Tue Feb 21 08:34:45 2006 +0000
    84.2 +++ b/src/audio/ums/SDL_umsaudio.c	Tue Feb 21 08:46:50 2006 +0000
    84.3 @@ -21,6 +21,7 @@
    84.4  
    84.5      based on linux/SDL_dspaudio.c by Sam Lantinga
    84.6  */
    84.7 +#include "SDL_config.h"
    84.8  
    84.9  /* Allow access to a raw mixing buffer */
   84.10  
    85.1 --- a/src/audio/ums/SDL_umsaudio.h	Tue Feb 21 08:34:45 2006 +0000
    85.2 +++ b/src/audio/ums/SDL_umsaudio.h	Tue Feb 21 08:46:50 2006 +0000
    85.3 @@ -21,6 +21,7 @@
    85.4  
    85.5      based on linux/SDL_dspaudio.h by Sam Lantinga
    85.6  */
    85.7 +#include "SDL_config.h"
    85.8  
    85.9  #ifndef _SDL_UMSaudio_h
   85.10  #define _SDL_UMSaudio_h
    86.1 --- a/src/audio/windib/SDL_dibaudio.c	Tue Feb 21 08:34:45 2006 +0000
    86.2 +++ b/src/audio/windib/SDL_dibaudio.c	Tue Feb 21 08:46:50 2006 +0000
    86.3 @@ -19,6 +19,7 @@
    86.4      Sam Lantinga
    86.5      slouken@libsdl.org
    86.6  */
    86.7 +#include "SDL_config.h"
    86.8  
    86.9  /* Allow access to a raw mixing buffer */
   86.10  
    87.1 --- a/src/audio/windib/SDL_dibaudio.h	Tue Feb 21 08:34:45 2006 +0000
    87.2 +++ b/src/audio/windib/SDL_dibaudio.h	Tue Feb 21 08:46:50 2006 +0000
    87.3 @@ -19,6 +19,7 @@
    87.4      Sam Lantinga
    87.5      slouken@libsdl.org
    87.6  */
    87.7 +#include "SDL_config.h"
    87.8  
    87.9  #ifndef _SDL_lowaudio_h
   87.10  #define _SDL_lowaudio_h
    88.1 --- a/src/audio/windx5/SDL_dx5audio.c	Tue Feb 21 08:34:45 2006 +0000
    88.2 +++ b/src/audio/windx5/SDL_dx5audio.c	Tue Feb 21 08:46:50 2006 +0000
    88.3 @@ -19,6 +19,7 @@
    88.4      Sam Lantinga
    88.5      slouken@libsdl.org
    88.6  */
    88.7 +#include "SDL_config.h"
    88.8  
    88.9  /* Allow access to a raw mixing buffer */
   88.10  
    89.1 --- a/src/audio/windx5/SDL_dx5audio.h	Tue Feb 21 08:34:45 2006 +0000
    89.2 +++ b/src/audio/windx5/SDL_dx5audio.h	Tue Feb 21 08:46:50 2006 +0000
    89.3 @@ -19,6 +19,7 @@
    89.4      Sam Lantinga
    89.5      slouken@libsdl.org
    89.6  */
    89.7 +#include "SDL_config.h"
    89.8  
    89.9  #ifndef _SDL_lowaudio_h
   89.10  #define _SDL_lowaudio_h
    90.1 --- a/src/cdrom/SDL_cdrom.c	Tue Feb 21 08:34:45 2006 +0000
    90.2 +++ b/src/cdrom/SDL_cdrom.c	Tue Feb 21 08:46:50 2006 +0000
    90.3 @@ -19,13 +19,14 @@
    90.4      Sam Lantinga
    90.5      slouken@libsdl.org
    90.6  */
    90.7 +#include "SDL_config.h"
    90.8  
    90.9  /* This is the CD-audio control API for Simple DirectMedia Layer */
   90.10  
   90.11  #include "SDL_cdrom.h"
   90.12  #include "SDL_syscdrom.h"
   90.13  
   90.14 -#if !defined(macintosh)
   90.15 +#if !defined(__MACOS__)
   90.16  #define CLIP_FRAMES	10	/* Some CD-ROMs won't go all the way */
   90.17  #endif
   90.18  
    91.1 --- a/src/cdrom/SDL_syscdrom.h	Tue Feb 21 08:34:45 2006 +0000
    91.2 +++ b/src/cdrom/SDL_syscdrom.h	Tue Feb 21 08:46:50 2006 +0000
    91.3 @@ -19,6 +19,7 @@
    91.4      Sam Lantinga
    91.5      slouken@libsdl.org
    91.6  */
    91.7 +#include "SDL_config.h"
    91.8  
    91.9  /* This is the system specific header for the SDL CD-ROM API */
   91.10  
    92.1 --- a/src/cdrom/aix/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    92.2 +++ b/src/cdrom/aix/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    92.3 @@ -21,6 +21,7 @@
    92.4  
    92.5      based on linux/SDL_syscdrom.c by Sam Lantinga
    92.6  */
    92.7 +#include "SDL_config.h"
    92.8  
    92.9  /* Functions for system-level CD-ROM audio control */
   92.10  
    93.1 --- a/src/cdrom/bsdi/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    93.2 +++ b/src/cdrom/bsdi/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    93.3 @@ -19,6 +19,7 @@
    93.4      Sam Lantinga
    93.5      slouken@libsdl.org
    93.6  */
    93.7 +#include "SDL_config.h"
    93.8  
    93.9  /*
   93.10   * Functions for system-level CD-ROM audio control for BSD/OS 4.x
    94.1 --- a/src/cdrom/dc/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    94.2 +++ b/src/cdrom/dc/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    94.3 @@ -19,6 +19,7 @@
    94.4      Sam Lantinga
    94.5      slouken@libsdl.org
    94.6  */
    94.7 +#include "SDL_config.h"
    94.8  
    94.9  /* Functions for system-level CD-ROM audio control */
   94.10  
    95.1 --- a/src/cdrom/dummy/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    95.2 +++ b/src/cdrom/dummy/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    95.3 @@ -19,6 +19,7 @@
    95.4      Sam Lantinga
    95.5      slouken@libsdl.org
    95.6  */
    95.7 +#include "SDL_config.h"
    95.8  
    95.9  /* Stub functions for system-level CD-ROM audio control */
   95.10  
    96.1 --- a/src/cdrom/freebsd/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    96.2 +++ b/src/cdrom/freebsd/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    96.3 @@ -19,6 +19,7 @@
    96.4      Sam Lantinga
    96.5      slouken@libsdl.org
    96.6  */
    96.7 +#include "SDL_config.h"
    96.8  
    96.9  /* Functions for system-level CD-ROM audio control */
   96.10  
    97.1 --- a/src/cdrom/linux/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    97.2 +++ b/src/cdrom/linux/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    97.3 @@ -19,6 +19,7 @@
    97.4      Sam Lantinga
    97.5      slouken@libsdl.org
    97.6  */
    97.7 +#include "SDL_config.h"
    97.8  
    97.9  /* Functions for system-level CD-ROM audio control */
   97.10  
   97.11 @@ -29,7 +30,7 @@
   97.12  #include <fcntl.h>
   97.13  #include <errno.h>
   97.14  #include <unistd.h>
   97.15 -#ifdef __linux__
   97.16 +#ifdef __LINUX__
   97.17  #ifdef HAVE_LINUX_VERSION_H
   97.18  /* linux 2.6.9 workaround */
   97.19  #include <linux/version.h>
    98.1 --- a/src/cdrom/macos/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
    98.2 +++ b/src/cdrom/macos/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
    98.3 @@ -19,6 +19,7 @@
    98.4      Sam Lantinga
    98.5      slouken@libsdl.org
    98.6  */
    98.7 +#include "SDL_config.h"
    98.8  
    98.9  /* MacOS functions for system-level CD-ROM audio control */
   98.10  
    99.1 --- a/src/cdrom/macos/SDL_syscdrom_c.h	Tue Feb 21 08:34:45 2006 +0000
    99.2 +++ b/src/cdrom/macos/SDL_syscdrom_c.h	Tue Feb 21 08:46:50 2006 +0000
    99.3 @@ -19,6 +19,7 @@
    99.4      Sam Lantinga
    99.5      slouken@libsdl.org
    99.6  */
    99.7 +#include "SDL_config.h"
    99.8  
    99.9  /* This is the MacOS specific header for the SDL CD-ROM API
   99.10     Contributed by Matt Slot
   100.1 --- a/src/cdrom/macosx/AudioFilePlayer.c	Tue Feb 21 08:34:45 2006 +0000
   100.2 +++ b/src/cdrom/macosx/AudioFilePlayer.c	Tue Feb 21 08:46:50 2006 +0000
   100.3 @@ -22,6 +22,7 @@
   100.4      This file based on Apple sample code. We haven't changed the file name, 
   100.5      so if you want to see the original search for it on apple.com/developer
   100.6  */
   100.7 +#include "SDL_config.h"
   100.8  
   100.9  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  100.10  //  AudioFilePlayer.cpp
   101.1 --- a/src/cdrom/macosx/AudioFilePlayer.h	Tue Feb 21 08:34:45 2006 +0000
   101.2 +++ b/src/cdrom/macosx/AudioFilePlayer.h	Tue Feb 21 08:46:50 2006 +0000
   101.3 @@ -22,6 +22,7 @@
   101.4      This file based on Apple sample code. We haven't changed the file name, 
   101.5      so if you want to see the original search for it on apple.com/developer
   101.6  */
   101.7 +#include "SDL_config.h"
   101.8  
   101.9  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  101.10  //  AudioFilePlayer.h
   102.1 --- a/src/cdrom/macosx/AudioFileReaderThread.c	Tue Feb 21 08:34:45 2006 +0000
   102.2 +++ b/src/cdrom/macosx/AudioFileReaderThread.c	Tue Feb 21 08:46:50 2006 +0000
   102.3 @@ -22,6 +22,7 @@
   102.4      This file based on Apple sample code. We haven't changed the file name, 
   102.5      so if you want to see the original search for it on apple.com/developer
   102.6  */
   102.7 +#include "SDL_config.h"
   102.8  
   102.9  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  102.10  // AudioFileManager.cpp
   103.1 --- a/src/cdrom/macosx/CDPlayer.c	Tue Feb 21 08:34:45 2006 +0000
   103.2 +++ b/src/cdrom/macosx/CDPlayer.c	Tue Feb 21 08:46:50 2006 +0000
   103.3 @@ -19,6 +19,7 @@
   103.4      Sam Lantinga
   103.5      slouken@libsdl.org
   103.6  */
   103.7 +#include "SDL_config.h"
   103.8  
   103.9  #include "CDPlayer.h"
  103.10  #include "AudioFilePlayer.h"
   104.1 --- a/src/cdrom/macosx/CDPlayer.h	Tue Feb 21 08:34:45 2006 +0000
   104.2 +++ b/src/cdrom/macosx/CDPlayer.h	Tue Feb 21 08:46:50 2006 +0000
   104.3 @@ -19,6 +19,7 @@
   104.4      Sam Lantinga
   104.5      slouken@libsdl.org
   104.6  */
   104.7 +#include "SDL_config.h"
   104.8  
   104.9  #ifndef __CDPlayer__H__
  104.10  #define __CDPlayer__H__ 1
   105.1 --- a/src/cdrom/macosx/SDLOSXCAGuard.c	Tue Feb 21 08:34:45 2006 +0000
   105.2 +++ b/src/cdrom/macosx/SDLOSXCAGuard.c	Tue Feb 21 08:46:50 2006 +0000
   105.3 @@ -19,6 +19,8 @@
   105.4      Sam Lantinga
   105.5      slouken@libsdl.org
   105.6  */
   105.7 +#include "SDL_config.h"
   105.8 +
   105.9  /*  
  105.10      Note: This file hasn't been modified so technically we have to keep the disclaimer :-(
  105.11      
   106.1 --- a/src/cdrom/macosx/SDLOSXCAGuard.h	Tue Feb 21 08:34:45 2006 +0000
   106.2 +++ b/src/cdrom/macosx/SDLOSXCAGuard.h	Tue Feb 21 08:46:50 2006 +0000
   106.3 @@ -19,6 +19,8 @@
   106.4      Sam Lantinga
   106.5      slouken@libsdl.org
   106.6  */
   106.7 +#include "SDL_config.h"
   106.8 +
   106.9  /*  
  106.10      Note: This file hasn't been modified so technically we have to keep the disclaimer :-(
  106.11  
   107.1 --- a/src/cdrom/macosx/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   107.2 +++ b/src/cdrom/macosx/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   107.3 @@ -19,6 +19,7 @@
   107.4      Sam Lantinga
   107.5      slouken@libsdl.org
   107.6  */
   107.7 +#include "SDL_config.h"
   107.8  
   107.9  #include "SDL_syscdrom_c.h"
  107.10  
   108.1 --- a/src/cdrom/macosx/SDL_syscdrom_c.h	Tue Feb 21 08:34:45 2006 +0000
   108.2 +++ b/src/cdrom/macosx/SDL_syscdrom_c.h	Tue Feb 21 08:46:50 2006 +0000
   108.3 @@ -19,6 +19,7 @@
   108.4      Sam Lantinga
   108.5      slouken@libsdl.org
   108.6  */
   108.7 +#include "SDL_config.h"
   108.8  
   108.9  /* This is the Mac OS X / CoreAudio specific header for the SDL CD-ROM API
  108.10     Contributed by Darrell Walisser and Max Horn
   109.1 --- a/src/cdrom/mint/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   109.2 +++ b/src/cdrom/mint/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   109.3 @@ -19,6 +19,7 @@
   109.4      Sam Lantinga
   109.5      slouken@libsdl.org
   109.6  */
   109.7 +#include "SDL_config.h"
   109.8  
   109.9  /*
  109.10  	Atari MetaDOS CD-ROM functions
   110.1 --- a/src/cdrom/openbsd/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   110.2 +++ b/src/cdrom/openbsd/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   110.3 @@ -19,6 +19,7 @@
   110.4      Sam Lantinga
   110.5      slouken@libsdl.org
   110.6  */
   110.7 +#include "SDL_config.h"
   110.8  
   110.9  /* Functions for system-level CD-ROM audio control */
  110.10  
  110.11 @@ -131,9 +132,9 @@
  110.12  int  SDL_SYS_CDInit(void)
  110.13  {
  110.14  	static char *checklist[] = {
  110.15 -#ifdef __OpenBSD__
  110.16 +#if defined(__OPENBSD__)
  110.17  		"?0 cd?c", "cdrom", NULL
  110.18 -#elif defined(__NetBSD__)
  110.19 +#elif defined(__NETBSD__)
  110.20  		"?0 cd?d", "?0 cd?c", "cdrom", NULL
  110.21  #else
  110.22  		"?0 cd?c", "?0 acd?c", "cdrom", NULL
   111.1 --- a/src/cdrom/os2/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   111.2 +++ b/src/cdrom/os2/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   111.3 @@ -19,6 +19,7 @@
   111.4      Sam Lantinga
   111.5      slouken@libsdl.org
   111.6  */
   111.7 +#include "SDL_config.h"
   111.8  
   111.9  /* Functions for system-level CD-ROM audio control */
  111.10  
   112.1 --- a/src/cdrom/osf/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   112.2 +++ b/src/cdrom/osf/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   112.3 @@ -18,7 +18,7 @@
   112.4  
   112.5  
   112.6  */
   112.7 -
   112.8 +#include "SDL_config.h"
   112.9  
  112.10  /* Functions for system-level CD-ROM audio control */
  112.11  
   113.1 --- a/src/cdrom/qnx/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   113.2 +++ b/src/cdrom/qnx/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   113.3 @@ -19,6 +19,7 @@
   113.4      Sam Lantinga
   113.5      slouken@libsdl.org
   113.6  */
   113.7 +#include "SDL_config.h"
   113.8  
   113.9  /* Functions for system-level CD-ROM audio control */
  113.10  
   114.1 --- a/src/cdrom/win32/SDL_syscdrom.c	Tue Feb 21 08:34:45 2006 +0000
   114.2 +++ b/src/cdrom/win32/SDL_syscdrom.c	Tue Feb 21 08:46:50 2006 +0000
   114.3 @@ -19,6 +19,7 @@
   114.4      Sam Lantinga
   114.5      slouken@libsdl.org
   114.6  */
   114.7 +#include "SDL_config.h"
   114.8  
   114.9  /* Functions for system-level CD-ROM audio control */
  114.10  
   115.1 --- a/src/cpuinfo/SDL_cpuinfo.c	Tue Feb 21 08:34:45 2006 +0000
   115.2 +++ b/src/cpuinfo/SDL_cpuinfo.c	Tue Feb 21 08:46:50 2006 +0000
   115.3 @@ -19,6 +19,7 @@
   115.4      Sam Lantinga
   115.5      slouken@libsdl.org
   115.6  */
   115.7 +#include "SDL_config.h"
   115.8  
   115.9  /* CPU feature detection for SDL */
  115.10  
  115.11 @@ -30,7 +31,7 @@
  115.12  #include <setjmp.h>
  115.13  #endif
  115.14  
  115.15 -#if MACOSX
  115.16 +#ifdef __MACOSX__
  115.17  #include <sys/sysctl.h> /* For AltiVec check */
  115.18  #endif
  115.19  
  115.20 @@ -307,7 +308,7 @@
  115.21  static __inline__ int CPU_haveAltiVec()
  115.22  {
  115.23  	volatile int altivec = 0;
  115.24 -#if MACOSX
  115.25 +#ifdef __MACOSX__
  115.26  	int selectors[2] = { CTL_HW, HW_VECTORUNIT }; 
  115.27  	int hasVectorUnit = 0; 
  115.28  	size_t length = sizeof(hasVectorUnit); 
   116.1 --- a/src/events/SDL_active.c	Tue Feb 21 08:34:45 2006 +0000
   116.2 +++ b/src/events/SDL_active.c	Tue Feb 21 08:46:50 2006 +0000
   116.3 @@ -19,6 +19,7 @@
   116.4      Sam Lantinga
   116.5      slouken@libsdl.org
   116.6  */
   116.7 +#include "SDL_config.h"
   116.8  
   116.9  /* Application focus/iconification handling code for SDL */
  116.10  
   117.1 --- a/src/events/SDL_events.c	Tue Feb 21 08:34:45 2006 +0000
   117.2 +++ b/src/events/SDL_events.c	Tue Feb 21 08:46:50 2006 +0000
   117.3 @@ -19,6 +19,7 @@
   117.4      Sam Lantinga
   117.5      slouken@libsdl.org
   117.6  */
   117.7 +#include "SDL_config.h"
   117.8  
   117.9  /* General event handling code for SDL */
  117.10  
  117.11 @@ -150,7 +151,7 @@
  117.12  #if !SDL_THREADS_DISABLED
  117.13  	SDL_EventQ.lock = SDL_CreateMutex();
  117.14  	if ( SDL_EventQ.lock == NULL ) {
  117.15 -#ifdef macintosh /* MacOS classic you can't multithread, so no lock needed */
  117.16 +#ifdef __MACOS__ /* MacOS classic you can't multithread, so no lock needed */
  117.17  		;
  117.18  #else
  117.19  		return(-1);
  117.20 @@ -168,7 +169,7 @@
  117.21  
  117.22  		/* The event thread will handle timers too */
  117.23  		SDL_SetTimerThreaded(2);
  117.24 -#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  117.25 +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
  117.26  #undef SDL_CreateThread
  117.27  		SDL_EventThread = SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL);
  117.28  #else
   118.1 --- a/src/events/SDL_events_c.h	Tue Feb 21 08:34:45 2006 +0000
   118.2 +++ b/src/events/SDL_events_c.h	Tue Feb 21 08:46:50 2006 +0000
   118.3 @@ -19,6 +19,7 @@
   118.4      Sam Lantinga
   118.5      slouken@libsdl.org
   118.6  */
   118.7 +#include "SDL_config.h"
   118.8  
   118.9  /* Useful functions and variables from SDL_events.c */
  118.10  #include "SDL_events.h"
   119.1 --- a/src/events/SDL_expose.c	Tue Feb 21 08:34:45 2006 +0000
   119.2 +++ b/src/events/SDL_expose.c	Tue Feb 21 08:46:50 2006 +0000
   119.3 @@ -19,6 +19,7 @@
   119.4      Sam Lantinga
   119.5      slouken@libsdl.org
   119.6  */
   119.7 +#include "SDL_config.h"
   119.8  
   119.9  /* Refresh event handling code for SDL */
  119.10  
   120.1 --- a/src/events/SDL_keyboard.c	Tue Feb 21 08:34:45 2006 +0000
   120.2 +++ b/src/events/SDL_keyboard.c	Tue Feb 21 08:46:50 2006 +0000
   120.3 @@ -19,6 +19,7 @@
   120.4      Sam Lantinga
   120.5      slouken@libsdl.org
   120.6  */
   120.7 +#include "SDL_config.h"
   120.8  
   120.9  /* General keyboard handling code for SDL */
  120.10  
   121.1 --- a/src/events/SDL_mouse.c	Tue Feb 21 08:34:45 2006 +0000
   121.2 +++ b/src/events/SDL_mouse.c	Tue Feb 21 08:46:50 2006 +0000
   121.3 @@ -19,6 +19,7 @@
   121.4      Sam Lantinga
   121.5      slouken@libsdl.org
   121.6  */
   121.7 +#include "SDL_config.h"
   121.8  
   121.9  /* General mouse handling code for SDL */
  121.10  
   122.1 --- a/src/events/SDL_quit.c	Tue Feb 21 08:34:45 2006 +0000
   122.2 +++ b/src/events/SDL_quit.c	Tue Feb 21 08:46:50 2006 +0000
   122.3 @@ -19,11 +19,10 @@
   122.4      Sam Lantinga
   122.5      slouken@libsdl.org
   122.6  */
   122.7 +#include "SDL_config.h"
   122.8  
   122.9  /* General quit handling code for SDL */
  122.10  
  122.11 -#include "SDL_config.h"
  122.12 -
  122.13  #ifdef HAVE_SIGNAL_H
  122.14  #include <signal.h>
  122.15  #endif
   123.1 --- a/src/events/SDL_resize.c	Tue Feb 21 08:34:45 2006 +0000
   123.2 +++ b/src/events/SDL_resize.c	Tue Feb 21 08:46:50 2006 +0000
   123.3 @@ -19,6 +19,7 @@
   123.4      Sam Lantinga
   123.5      slouken@libsdl.org
   123.6  */
   123.7 +#include "SDL_config.h"
   123.8  
   123.9  /* Resize event handling code for SDL */
  123.10  
   124.1 --- a/src/events/SDL_sysevents.h	Tue Feb 21 08:34:45 2006 +0000
   124.2 +++ b/src/events/SDL_sysevents.h	Tue Feb 21 08:46:50 2006 +0000
   124.3 @@ -19,6 +19,7 @@
   124.4      Sam Lantinga
   124.5      slouken@libsdl.org
   124.6  */
   124.7 +#include "SDL_config.h"
   124.8  
   124.9  #include "../video/SDL_sysvideo.h"
  124.10  
  124.11 @@ -28,7 +29,7 @@
  124.12  #define MUST_THREAD_EVENTS
  124.13  #endif
  124.14  
  124.15 -#ifdef WIN32		/* Win32 doesn't allow a separate event thread */
  124.16 +#ifdef __WIN32__	/* Win32 doesn't allow a separate event thread */
  124.17  #define CANT_THREAD_EVENTS
  124.18  #endif
  124.19  
  124.20 @@ -36,7 +37,7 @@
  124.21  #define CANT_THREAD_EVENTS
  124.22  #endif
  124.23  
  124.24 -#ifdef macintosh	/* MacOS 7/8 don't support preemptive multi-tasking */
  124.25 +#ifdef __MACOS__	/* MacOS 7/8 don't support preemptive multi-tasking */
  124.26  #define CANT_THREAD_EVENTS
  124.27  #endif
  124.28  
   125.1 --- a/src/file/SDL_rwops.c	Tue Feb 21 08:34:45 2006 +0000
   125.2 +++ b/src/file/SDL_rwops.c	Tue Feb 21 08:46:50 2006 +0000
   125.3 @@ -19,6 +19,7 @@
   125.4      Sam Lantinga
   125.5      slouken@libsdl.org
   125.6  */
   125.7 +#include "SDL_config.h"
   125.8  
   125.9  /* This file provides a general interface for SDL to read and write
  125.10     data sources.  It can easily be extended to files, memory, etc.
  125.11 @@ -147,14 +148,14 @@
  125.12  }
  125.13  
  125.14  /* Functions to create SDL_RWops structures from various data sources */
  125.15 -#ifdef WIN32
  125.16 +#ifdef __WIN32__
  125.17  /* Aggh.  You can't (apparently) open a file in an application and
  125.18     read from it in a DLL.
  125.19  */
  125.20  static int in_sdl = 0;
  125.21  #endif
  125.22  
  125.23 -#ifdef macintosh
  125.24 +#ifdef __MACOS__
  125.25  /*
  125.26   * translate unix-style slash-separated filename to mac-style colon-separated
  125.27   * name; return malloced string
  125.28 @@ -196,7 +197,7 @@
  125.29  	*dst++ = '\0';
  125.30  	return path;
  125.31  }
  125.32 -#endif /* macintosh */
  125.33 +#endif /* __MACOS__ */
  125.34  
  125.35  SDL_RWops *SDL_RWFromFile(const char *file, const char *mode)
  125.36  {
  125.37 @@ -204,7 +205,7 @@
  125.38  #ifdef HAVE_STDIO_H
  125.39  	FILE *fp;
  125.40  
  125.41 -#ifdef macintosh
  125.42 +#ifdef __MACOS__
  125.43  	{
  125.44  		char *mpath = unix_to_mac(file);
  125.45  		fp = fopen(mpath, mode);
  125.46 @@ -216,7 +217,7 @@
  125.47  	if ( fp == NULL ) {
  125.48  		SDL_SetError("Couldn't open %s", file);
  125.49  	} else {
  125.50 -#ifdef WIN32
  125.51 +#ifdef __WIN32__
  125.52  		in_sdl = 1;
  125.53  		rwops = SDL_RWFromFP(fp, 1);
  125.54  		in_sdl = 0;
  125.55 @@ -233,7 +234,7 @@
  125.56  {
  125.57  	SDL_RWops *rwops = NULL;
  125.58  
  125.59 -#ifdef WIN32
  125.60 +#ifdef __WIN32__
  125.61  	if ( ! in_sdl ) {
  125.62  		/* It's when SDL and the app are compiled with different C runtimes */
  125.63  		SDL_SetError("You can't pass a FILE pointer to a DLL (?)");
   126.1 --- a/src/hermes/HeadMMX.h	Tue Feb 21 08:34:45 2006 +0000
   126.2 +++ b/src/hermes/HeadMMX.h	Tue Feb 21 08:46:50 2006 +0000
   126.3 @@ -6,6 +6,7 @@
   126.4     Please refer to the file COPYING.LIB contained in the distribution for
   126.5     licensing conditions
   126.6  */
   126.7 +#include "SDL_config.h"
   126.8  
   126.9  #ifndef __HERMES_HEAD_MMX__
  126.10  #define __HERMES_HEAD_MMX__
   127.1 --- a/src/joystick/SDL_joystick.c	Tue Feb 21 08:34:45 2006 +0000
   127.2 +++ b/src/joystick/SDL_joystick.c	Tue Feb 21 08:46:50 2006 +0000
   127.3 @@ -19,6 +19,7 @@
   127.4      Sam Lantinga
   127.5      slouken@libsdl.org
   127.6  */
   127.7 +#include "SDL_config.h"
   127.8  
   127.9  /* This is the joystick API for Simple DirectMedia Layer */
  127.10  
   128.1 --- a/src/joystick/SDL_joystick_c.h	Tue Feb 21 08:34:45 2006 +0000
   128.2 +++ b/src/joystick/SDL_joystick_c.h	Tue Feb 21 08:46:50 2006 +0000
   128.3 @@ -19,6 +19,7 @@
   128.4      Sam Lantinga
   128.5      slouken@libsdl.org
   128.6  */
   128.7 +#include "SDL_config.h"
   128.8  
   128.9  /* Useful functions and variables from SDL_joystick.c */
  128.10  #include "SDL_joystick.h"
   129.1 --- a/src/joystick/SDL_sysjoystick.h	Tue Feb 21 08:34:45 2006 +0000
   129.2 +++ b/src/joystick/SDL_sysjoystick.h	Tue Feb 21 08:46:50 2006 +0000
   129.3 @@ -19,6 +19,7 @@
   129.4      Sam Lantinga
   129.5      slouken@libsdl.org
   129.6  */
   129.7 +#include "SDL_config.h"
   129.8  
   129.9  /* This is the system specific header for the SDL joystick API */
  129.10  
   130.1 --- a/src/joystick/amigaos/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   130.2 +++ b/src/joystick/amigaos/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   130.3 @@ -19,7 +19,7 @@
   130.4      Sam Lantinga
   130.5      slouken@libsdl.org
   130.6  */
   130.7 -
   130.8 +#include "SDL_config.h"
   130.9  
  130.10  /* This is the system specific header for the SDL joystick API */
  130.11  
   131.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   131.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   131.3 @@ -19,6 +19,7 @@
   131.4      Sam Lantinga
   131.5      slouken@libsdl.org
   131.6  */
   131.7 +#include "SDL_config.h"
   131.8  
   131.9  /*
  131.10   * Joystick driver for the uhid(4) interface found in OpenBSD,
  131.11 @@ -47,12 +48,12 @@
  131.12  #include <libusbhid.h>
  131.13  #endif
  131.14  
  131.15 -#ifdef __FreeBSD__
  131.16 +#ifdef __FREEBSD__
  131.17  #include <osreldate.h>
  131.18  #include <sys/joystick.h>
  131.19  #endif
  131.20  
  131.21 -#if defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__))
  131.22 +#if defined(__NETBSD__) || (defined(__OPENBSD__) && defined(__i386__))
  131.23  #include <machine/joystick.h>
  131.24  #endif
  131.25  
  131.26 @@ -281,7 +282,7 @@
  131.27  		goto usberr;
  131.28  	}
  131.29  
  131.30 -#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
  131.31 +#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_version >= 500111)
  131.32  	hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
  131.33  #else
  131.34  	hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
  131.35 @@ -361,7 +362,7 @@
  131.36  	int nbutton, naxe = -1;
  131.37  	Sint32 v;
  131.38  
  131.39 -#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__))
  131.40 +#if defined(__FREEBSD__) || defined(__NETBSD__) || (defined(__OPENBSD__) && defined(__i386__))
  131.41  	struct joystick gameport;
  131.42  	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
  131.43   
  131.44 @@ -410,14 +411,14 @@
  131.45  		}
  131.46  		return;
  131.47  	}
  131.48 -#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
  131.49 +#endif /* defined(__FREEBSD__) || defined(__NETBSD__) || defined(__OPENBSD__) */
  131.50  	
  131.51  	rep = &joy->hwdata->inreport;
  131.52  
  131.53  	if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
  131.54  		return;
  131.55  	}
  131.56 -#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
  131.57 +#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_version >= 500111)
  131.58  	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
  131.59  #else
  131.60  	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
  131.61 @@ -509,7 +510,7 @@
  131.62  {
  131.63  	int len;
  131.64  
  131.65 -#ifdef __FreeBSD__
  131.66 +#ifdef __FREEBSD__
  131.67  # if (__FreeBSD_version >= 460000)
  131.68  #  if (__FreeBSD_version <= 500111)
  131.69  	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
   132.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   132.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   132.3 @@ -19,6 +19,7 @@
   132.4  	Sam Lantinga
   132.5  	slouken@libsdl.org
   132.6  */
   132.7 +#include "SDL_config.h"
   132.8  
   132.9  /* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */
  132.10  /* Written 2001 by Max Horn */
   133.1 --- a/src/joystick/dc/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   133.2 +++ b/src/joystick/dc/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   133.3 @@ -19,6 +19,7 @@
   133.4      Sam Lantinga
   133.5      slouken@libsdl.org
   133.6  */
   133.7 +#include "SDL_config.h"
   133.8  
   133.9  /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
  133.10  
   134.1 --- a/src/joystick/dummy/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   134.2 +++ b/src/joystick/dummy/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   134.3 @@ -19,6 +19,7 @@
   134.4      Sam Lantinga
   134.5      slouken@libsdl.org
   134.6  */
   134.7 +#include "SDL_config.h"
   134.8  
   134.9  /* This is the system specific header for the SDL joystick API */
  134.10  
   135.1 --- a/src/joystick/linux/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   135.2 +++ b/src/joystick/linux/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   135.3 @@ -19,6 +19,7 @@
   135.4      Sam Lantinga
   135.5      slouken@libsdl.org
   135.6  */
   135.7 +#include "SDL_config.h"
   135.8  
   135.9  /* This is the system specific header for the SDL joystick API */
  135.10  
   136.1 --- a/src/joystick/macos/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   136.2 +++ b/src/joystick/macos/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   136.3 @@ -19,6 +19,7 @@
   136.4      Sam Lantinga
   136.5      slouken@libsdl.org
   136.6  */
   136.7 +#include "SDL_config.h"
   136.8  
   136.9  /*  SDL stuff  --  "SDL_sysjoystick.c"
  136.10      MacOS joystick functions by Frederick Reitberger
   137.1 --- a/src/joystick/mint/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   137.2 +++ b/src/joystick/mint/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   137.3 @@ -19,6 +19,7 @@
   137.4      Sam Lantinga
   137.5      slouken@libsdl.org
   137.6  */
   137.7 +#include "SDL_config.h"
   137.8  
   137.9  /*
  137.10   *	Atari Joystick/Joypad drivers
   138.1 --- a/src/joystick/os2/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   138.2 +++ b/src/joystick/os2/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   138.3 @@ -19,6 +19,7 @@
   138.4      Sam Lantinga
   138.5      slouken@libsdl.org
   138.6  */
   138.7 +#include "SDL_config.h"
   138.8  
   138.9  /* OS/2 Joystick driver, contributed by Daniel Caetano */
  138.10  
   139.1 --- a/src/joystick/riscos/SDL_sysjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   139.2 +++ b/src/joystick/riscos/SDL_sysjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   139.3 @@ -19,6 +19,7 @@
   139.4      Sam Lantinga
   139.5      slouken@libsdl.org
   139.6  */
   139.7 +#include "SDL_config.h"
   139.8  
   139.9  /*
  139.10     RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003
   140.1 --- a/src/joystick/win32/SDL_mmjoystick.c	Tue Feb 21 08:34:45 2006 +0000
   140.2 +++ b/src/joystick/win32/SDL_mmjoystick.c	Tue Feb 21 08:46:50 2006 +0000
   140.3 @@ -19,6 +19,7 @@
   140.4      Sam Lantinga
   140.5      slouken@libsdl.org
   140.6  */
   140.7 +#include "SDL_config.h"
   140.8  
   140.9  /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
  140.10  
   141.1 --- a/src/loadso/beos/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   141.2 +++ b/src/loadso/beos/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   141.3 @@ -19,6 +19,7 @@
   141.4      Sam Lantinga
   141.5      slouken@libsdl.org
   141.6  */
   141.7 +#include "SDL_config.h"
   141.8  
   141.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  141.10  /* System dependent library loading routines                           */
   142.1 --- a/src/loadso/dlopen/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   142.2 +++ b/src/loadso/dlopen/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   142.3 @@ -19,6 +19,7 @@
   142.4      Sam Lantinga
   142.5      slouken@libsdl.org
   142.6  */
   142.7 +#include "SDL_config.h"
   142.8  
   142.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  142.10  /* System dependent library loading routines                           */
   143.1 --- a/src/loadso/dummy/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   143.2 +++ b/src/loadso/dummy/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   143.3 @@ -19,6 +19,7 @@
   143.4      Sam Lantinga
   143.5      slouken@libsdl.org
   143.6  */
   143.7 +#include "SDL_config.h"
   143.8  
   143.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  143.10  /* System dependent library loading routines                           */
   144.1 --- a/src/loadso/macos/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   144.2 +++ b/src/loadso/macos/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   144.3 @@ -19,6 +19,7 @@
   144.4      Sam Lantinga
   144.5      slouken@libsdl.org
   144.6  */
   144.7 +#include "SDL_config.h"
   144.8  
   144.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  144.10  /* System dependent library loading routines                           */
   145.1 --- a/src/loadso/macosx/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   145.2 +++ b/src/loadso/macosx/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   145.3 @@ -19,6 +19,7 @@
   145.4      Sam Lantinga
   145.5      slouken@libsdl.org
   145.6  */
   145.7 +#include "SDL_config.h"
   145.8  
   145.9  /* Please note that dlcompat apparently ships in current Mac OS X versions
  145.10   *  as a system library that provides compatibility with the Unix "dlopen"
   146.1 --- a/src/loadso/mint/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   146.2 +++ b/src/loadso/mint/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   146.3 @@ -19,6 +19,7 @@
   146.4      Sam Lantinga
   146.5      slouken@libsdl.org
   146.6  */
   146.7 +#include "SDL_config.h"
   146.8  
   146.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  146.10  /* System dependent library loading routines                           */
   147.1 --- a/src/loadso/os2/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   147.2 +++ b/src/loadso/os2/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   147.3 @@ -19,6 +19,7 @@
   147.4      Sam Lantinga
   147.5      slouken@libsdl.org
   147.6  */
   147.7 +#include "SDL_config.h"
   147.8  
   147.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  147.10  /* System dependent library loading routines                           */
   148.1 --- a/src/loadso/win32/SDL_sysloadso.c	Tue Feb 21 08:34:45 2006 +0000
   148.2 +++ b/src/loadso/win32/SDL_sysloadso.c	Tue Feb 21 08:46:50 2006 +0000
   148.3 @@ -19,6 +19,7 @@
   148.4      Sam Lantinga
   148.5      slouken@libsdl.org
   148.6  */
   148.7 +#include "SDL_config.h"
   148.8  
   148.9  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  148.10  /* System dependent library loading routines                           */
  148.11 @@ -55,7 +56,7 @@
  148.12  	SDL_free(sofile_t);
  148.13  	SDL_free(errbuf_t);
  148.14  
  148.15 -#else /*if defined(WIN32)*/
  148.16 +#else /*if defined(__WIN32__)*/
  148.17  	char errbuf[512];
  148.18  
  148.19  	handle = (void *)LoadLibrary(sofile);
   149.1 --- a/src/main/beos/SDL_BeApp.h	Tue Feb 21 08:34:45 2006 +0000
   149.2 +++ b/src/main/beos/SDL_BeApp.h	Tue Feb 21 08:46:50 2006 +0000
   149.3 @@ -19,6 +19,7 @@
   149.4      Sam Lantinga
   149.5      slouken@libsdl.org
   149.6  */
   149.7 +#include "SDL_config.h"
   149.8  
   149.9  /* Handle the BeApp specific portions of the application */
  149.10  
   150.1 --- a/src/stdlib/SDL_getenv.c	Tue Feb 21 08:34:45 2006 +0000
   150.2 +++ b/src/stdlib/SDL_getenv.c	Tue Feb 21 08:46:50 2006 +0000
   150.3 @@ -19,12 +19,13 @@
   150.4      Sam Lantinga
   150.5      slouken@libsdl.org
   150.6  */
   150.7 +#include "SDL_config.h"
   150.8  
   150.9  #include "SDL_stdinc.h"
  150.10  
  150.11  #ifndef HAVE_GETENV
  150.12  
  150.13 -#if defined(WIN32) && !defined(_WIN32_WCE)
  150.14 +#if defined(__WIN32__) && !defined(_WIN32_WCE)
  150.15  
  150.16  #include "SDL_windows.h"
  150.17  
  150.18 @@ -169,7 +170,7 @@
  150.19  	return value;
  150.20  }
  150.21  
  150.22 -#endif /* WIN32 */
  150.23 +#endif /* __WIN32__ */
  150.24  
  150.25  #endif /* !HAVE_GETENV */
  150.26  
   151.1 --- a/src/stdlib/SDL_malloc.c	Tue Feb 21 08:34:45 2006 +0000
   151.2 +++ b/src/stdlib/SDL_malloc.c	Tue Feb 21 08:46:50 2006 +0000
   151.3 @@ -19,7 +19,7 @@
   151.4      Sam Lantinga
   151.5      slouken@libsdl.org
   151.6  */
   151.7 -
   151.8 +#include "SDL_config.h"
   151.9  
  151.10  /* This file contains portable memory management functions for SDL */
  151.11  
   152.1 --- a/src/stdlib/SDL_qsort.c	Tue Feb 21 08:34:45 2006 +0000
   152.2 +++ b/src/stdlib/SDL_qsort.c	Tue Feb 21 08:46:50 2006 +0000
   152.3 @@ -41,6 +41,7 @@
   152.4   *
   152.5   * Gareth McCaughan   Peterhouse   Cambridge   1998
   152.6   */
   152.7 +#include "SDL_config.h"
   152.8  
   152.9  /*
  152.10  #include <assert.h>
   153.1 --- a/src/stdlib/SDL_stdlib.c	Tue Feb 21 08:34:45 2006 +0000
   153.2 +++ b/src/stdlib/SDL_stdlib.c	Tue Feb 21 08:46:50 2006 +0000
   153.3 @@ -19,7 +19,7 @@
   153.4      Sam Lantinga
   153.5      slouken@libsdl.org
   153.6  */
   153.7 -
   153.8 +#include "SDL_config.h"
   153.9  
  153.10  /* This file contains portable stdlib functions for SDL */
  153.11  
   154.1 --- a/src/stdlib/SDL_string.c	Tue Feb 21 08:34:45 2006 +0000
   154.2 +++ b/src/stdlib/SDL_string.c	Tue Feb 21 08:46:50 2006 +0000
   154.3 @@ -19,7 +19,7 @@
   154.4      Sam Lantinga
   154.5      slouken@libsdl.org
   154.6  */
   154.7 -
   154.8 +#include "SDL_config.h"
   154.9  
  154.10  /* This file contains portable string manipulation functions for SDL */
  154.11  
   155.1 --- a/src/thread/SDL_systhread.h	Tue Feb 21 08:34:45 2006 +0000
   155.2 +++ b/src/thread/SDL_systhread.h	Tue Feb 21 08:46:50 2006 +0000
   155.3 @@ -19,6 +19,7 @@
   155.4      Sam Lantinga
   155.5      slouken@libsdl.org
   155.6  */
   155.7 +#include "SDL_config.h"
   155.8  
   155.9  /* These are functions that need to be implemented by a port of SDL */
  155.10  
  155.11 @@ -31,7 +32,7 @@
  155.12     saves a system-dependent thread id in thread->id, and returns 0
  155.13     on success.
  155.14  */
  155.15 -#if defined(_WIN32) || defined(__OS2__)
  155.16 +#if defined(__WIN32__) || defined(__OS2__)
  155.17  extern int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
  155.18  #else
  155.19  extern int SDL_SYS_CreateThread(SDL_Thread *thread, void *args);
   156.1 --- a/src/thread/SDL_thread.c	Tue Feb 21 08:34:45 2006 +0000
   156.2 +++ b/src/thread/SDL_thread.c	Tue Feb 21 08:46:50 2006 +0000
   156.3 @@ -19,6 +19,7 @@
   156.4      Sam Lantinga
   156.5      slouken@libsdl.org
   156.6  */
   156.7 +#include "SDL_config.h"
   156.8  
   156.9  /* System independent thread management routines for SDL */
  156.10  
  156.11 @@ -208,7 +209,7 @@
  156.12  	*statusloc = userfunc(userdata);
  156.13  }
  156.14  
  156.15 -#if defined(_WIN32) || defined(__OS2__)
  156.16 +#if defined(__WIN32__) || defined(__OS2__)
  156.17  #undef SDL_CreateThread
  156.18  DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread)
  156.19  #else
  156.20 @@ -249,7 +250,7 @@
  156.21  	SDL_AddThread(thread);
  156.22  
  156.23  	/* Create the thread and go! */
  156.24 -#if defined(_WIN32) || defined(__OS2__)
  156.25 +#if defined(__WIN32__) || defined(__OS2__)
  156.26  	ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread);
  156.27  #else
  156.28  	ret = SDL_SYS_CreateThread(thread, args);
   157.1 --- a/src/thread/SDL_thread_c.h	Tue Feb 21 08:34:45 2006 +0000
   157.2 +++ b/src/thread/SDL_thread_c.h	Tue Feb 21 08:46:50 2006 +0000
   157.3 @@ -19,6 +19,7 @@
   157.4      Sam Lantinga
   157.5      slouken@libsdl.org
   157.6  */
   157.7 +#include "SDL_config.h"
   157.8  
   157.9  #ifndef _SDL_thread_c_h
  157.10  #define _SDL_thread_c_h
   158.1 --- a/src/thread/amigaos/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   158.2 +++ b/src/thread/amigaos/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   158.3 @@ -19,6 +19,7 @@
   158.4      Sam Lantinga
   158.5      slouken@libsdl.org
   158.6  */
   158.7 +#include "SDL_config.h"
   158.8  
   158.9  /* An implementation of semaphores using mutexes and condition variables */
  158.10  
   159.1 --- a/src/thread/amigaos/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   159.2 +++ b/src/thread/amigaos/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   159.3 @@ -19,6 +19,7 @@
   159.4      Sam Lantinga
   159.5      slouken@libsdl.org
   159.6  */
   159.7 +#include "SDL_config.h"
   159.8  
   159.9  /* BeOS thread management routines for SDL */
  159.10  
   160.1 --- a/src/thread/amigaos/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   160.2 +++ b/src/thread/amigaos/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   160.3 @@ -19,6 +19,7 @@
   160.4      Sam Lantinga
   160.5      slouken@libsdl.org
   160.6  */
   160.7 +#include "SDL_config.h"
   160.8  
   160.9  #include <exec/exec.h>
  160.10  #include <dos/dos.h>
   161.1 --- a/src/thread/amigaos/SDL_thread.c	Tue Feb 21 08:34:45 2006 +0000
   161.2 +++ b/src/thread/amigaos/SDL_thread.c	Tue Feb 21 08:46:50 2006 +0000
   161.3 @@ -19,6 +19,7 @@
   161.4      Sam Lantinga
   161.5      slouken@libsdl.org
   161.6  */
   161.7 +#include "SDL_config.h"
   161.8  
   161.9  /* System independent thread management routines for SDL */
  161.10  
   162.1 --- a/src/thread/beos/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   162.2 +++ b/src/thread/beos/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   162.3 @@ -19,6 +19,7 @@
   162.4      Sam Lantinga
   162.5      slouken@libsdl.org
   162.6  */
   162.7 +#include "SDL_config.h"
   162.8  
   162.9  /* Semaphores in the BeOS environment */
  162.10  
   163.1 --- a/src/thread/beos/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   163.2 +++ b/src/thread/beos/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   163.3 @@ -19,6 +19,7 @@
   163.4      Sam Lantinga
   163.5      slouken@libsdl.org
   163.6  */
   163.7 +#include "SDL_config.h"
   163.8  
   163.9  /* BeOS thread management routines for SDL */
  163.10  
   164.1 --- a/src/thread/beos/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   164.2 +++ b/src/thread/beos/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   164.3 @@ -19,6 +19,7 @@
   164.4      Sam Lantinga
   164.5      slouken@libsdl.org
   164.6  */
   164.7 +#include "SDL_config.h"
   164.8  
   164.9  #include <signal.h>
  164.10  #include <be/kernel/OS.h>
   165.1 --- a/src/thread/dc/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   165.2 +++ b/src/thread/dc/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   165.3 @@ -19,6 +19,7 @@
   165.4      Sam Lantinga
   165.5      slouken@libsdl.org
   165.6  */
   165.7 +#include "SDL_config.h"
   165.8  
   165.9  /* An implementation of condition variables using semaphores and mutexes */
  165.10  /*
   166.1 --- a/src/thread/dc/SDL_syscond_c.h	Tue Feb 21 08:34:45 2006 +0000
   166.2 +++ b/src/thread/dc/SDL_syscond_c.h	Tue Feb 21 08:46:50 2006 +0000
   166.3 @@ -19,4 +19,5 @@
   166.4      Sam Lantinga
   166.5      slouken@libsdl.org
   166.6  */
   166.7 +#include "SDL_config.h"
   166.8  
   167.1 --- a/src/thread/dc/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   167.2 +++ b/src/thread/dc/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   167.3 @@ -19,6 +19,7 @@
   167.4      Sam Lantinga
   167.5      slouken@libsdl.org
   167.6  */
   167.7 +#include "SDL_config.h"
   167.8  
   167.9  /* An implementation of mutexes using semaphores */
  167.10  
   168.1 --- a/src/thread/dc/SDL_sysmutex_c.h	Tue Feb 21 08:34:45 2006 +0000
   168.2 +++ b/src/thread/dc/SDL_sysmutex_c.h	Tue Feb 21 08:46:50 2006 +0000
   168.3 @@ -19,4 +19,5 @@
   168.4      Sam Lantinga
   168.5      slouken@libsdl.org
   168.6  */
   168.7 +#include "SDL_config.h"
   168.8  
   169.1 --- a/src/thread/dc/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   169.2 +++ b/src/thread/dc/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   169.3 @@ -19,6 +19,7 @@
   169.4      Sam Lantinga
   169.5      slouken@libsdl.org
   169.6  */
   169.7 +#include "SDL_config.h"
   169.8  
   169.9  /* An implementation of semaphores using mutexes and condition variables */
  169.10  
   170.1 --- a/src/thread/dc/SDL_syssem_c.h	Tue Feb 21 08:34:45 2006 +0000
   170.2 +++ b/src/thread/dc/SDL_syssem_c.h	Tue Feb 21 08:46:50 2006 +0000
   170.3 @@ -19,4 +19,5 @@
   170.4      Sam Lantinga
   170.5      slouken@libsdl.org
   170.6  */
   170.7 +#include "SDL_config.h"
   170.8  
   171.1 --- a/src/thread/dc/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   171.2 +++ b/src/thread/dc/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   171.3 @@ -19,6 +19,7 @@
   171.4      Sam Lantinga
   171.5      slouken@libsdl.org
   171.6  */
   171.7 +#include "SDL_config.h"
   171.8  
   171.9  /* Thread management routines for SDL */
  171.10  
   172.1 --- a/src/thread/dc/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   172.2 +++ b/src/thread/dc/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   172.3 @@ -19,5 +19,6 @@
   172.4      Sam Lantinga
   172.5      slouken@libsdl.org
   172.6  */
   172.7 +#include "SDL_config.h"
   172.8  
   172.9  typedef struct kthread* SYS_ThreadHandle;
   173.1 --- a/src/thread/epoc/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   173.2 +++ b/src/thread/epoc/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   173.3 @@ -19,6 +19,7 @@
   173.4      Sam Lantinga
   173.5      slouken@libsdl.org
   173.6  */
   173.7 +#include "SDL_config.h"
   173.8  
   173.9  /*
  173.10      SDL_systhread_c.h
   174.1 --- a/src/thread/generic/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   174.2 +++ b/src/thread/generic/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   174.3 @@ -19,6 +19,7 @@
   174.4      Sam Lantinga
   174.5      slouken@libsdl.org
   174.6  */
   174.7 +#include "SDL_config.h"
   174.8  
   174.9  /* An implementation of condition variables using semaphores and mutexes */
  174.10  /*
   175.1 --- a/src/thread/generic/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   175.2 +++ b/src/thread/generic/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   175.3 @@ -19,6 +19,7 @@
   175.4      Sam Lantinga
   175.5      slouken@libsdl.org
   175.6  */
   175.7 +#include "SDL_config.h"
   175.8  
   175.9  /* An implementation of mutexes using semaphores */
  175.10  
   176.1 --- a/src/thread/generic/SDL_sysmutex_c.h	Tue Feb 21 08:34:45 2006 +0000
   176.2 +++ b/src/thread/generic/SDL_sysmutex_c.h	Tue Feb 21 08:46:50 2006 +0000
   176.3 @@ -19,4 +19,5 @@
   176.4      Sam Lantinga
   176.5      slouken@libsdl.org
   176.6  */
   176.7 +#include "SDL_config.h"
   176.8  
   177.1 --- a/src/thread/generic/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   177.2 +++ b/src/thread/generic/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   177.3 @@ -19,6 +19,7 @@
   177.4      Sam Lantinga
   177.5      slouken@libsdl.org
   177.6  */
   177.7 +#include "SDL_config.h"
   177.8  
   177.9  /* An implementation of semaphores using mutexes and condition variables */
  177.10  
   178.1 --- a/src/thread/generic/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   178.2 +++ b/src/thread/generic/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   178.3 @@ -19,6 +19,7 @@
   178.4      Sam Lantinga
   178.5      slouken@libsdl.org
   178.6  */
   178.7 +#include "SDL_config.h"
   178.8  
   178.9  /* Thread management routines for SDL */
  178.10  
   179.1 --- a/src/thread/generic/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   179.2 +++ b/src/thread/generic/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   179.3 @@ -19,6 +19,7 @@
   179.4      Sam Lantinga
   179.5      slouken@libsdl.org
   179.6  */
   179.7 +#include "SDL_config.h"
   179.8  
   179.9  /* Stub until we implement threads on this platform */
  179.10  typedef int SYS_ThreadHandle;
   180.1 --- a/src/thread/irix/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   180.2 +++ b/src/thread/irix/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   180.3 @@ -19,6 +19,7 @@
   180.4      Sam Lantinga
   180.5      slouken@libsdl.org
   180.6  */
   180.7 +#include "SDL_config.h"
   180.8  
   180.9  #include "SDL_thread.h"
  180.10  #include "SDL_timer.h"
  180.11 @@ -103,7 +104,7 @@
  180.12  void SDL_DestroySemaphore(SDL_sem *sem)
  180.13  {
  180.14  	if ( sem ) {
  180.15 -#ifdef _SGI_SOURCE
  180.16 +#ifdef __IRIX__
  180.17  		semctl(sem->id, 0, IPC_RMID);
  180.18  #else
  180.19  		union semun dummy;
  180.20 @@ -193,7 +194,7 @@
  180.21  	value = 0;
  180.22  	if ( sem ) {
  180.23  	  tryagain:
  180.24 -#ifdef _SGI_SOURCE
  180.25 +#ifdef __IRIX__
  180.26  		semval = semctl(sem->id, 0, GETVAL);
  180.27  #else
  180.28  		{
   181.1 --- a/src/thread/irix/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   181.2 +++ b/src/thread/irix/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   181.3 @@ -19,6 +19,7 @@
   181.4      Sam Lantinga
   181.5      slouken@libsdl.org
   181.6  */
   181.7 +#include "SDL_config.h"
   181.8  
   181.9  /* IRIX thread management routines for SDL */
  181.10  
   182.1 --- a/src/thread/irix/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   182.2 +++ b/src/thread/irix/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   182.3 @@ -19,6 +19,7 @@
   182.4      Sam Lantinga
   182.5      slouken@libsdl.org
   182.6  */
   182.7 +#include "SDL_config.h"
   182.8  
   182.9  #include <sys/types.h>
  182.10  
   183.1 --- a/src/thread/os2/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   183.2 +++ b/src/thread/os2/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   183.3 @@ -19,6 +19,7 @@
   183.4      Sam Lantinga
   183.5      slouken@libsdl.org
   183.6  */
   183.7 +#include "SDL_config.h"
   183.8  
   183.9  /* An implementation of condition variables using semaphores and mutexes */
  183.10  /*
   184.1 --- a/src/thread/os2/SDL_syscond_c.h	Tue Feb 21 08:34:45 2006 +0000
   184.2 +++ b/src/thread/os2/SDL_syscond_c.h	Tue Feb 21 08:46:50 2006 +0000
   184.3 @@ -19,4 +19,5 @@
   184.4      Sam Lantinga
   184.5      slouken@libsdl.org
   184.6  */
   184.7 +#include "SDL_config.h"
   184.8  
   185.1 --- a/src/thread/os2/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   185.2 +++ b/src/thread/os2/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   185.3 @@ -19,6 +19,7 @@
   185.4      Sam Lantinga
   185.5      slouken@libsdl.org
   185.6  */
   185.7 +#include "SDL_config.h"
   185.8  
   185.9  /* Mutex functions using the OS/2 API */
  185.10  
   186.1 --- a/src/thread/os2/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   186.2 +++ b/src/thread/os2/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   186.3 @@ -19,6 +19,7 @@
   186.4      Sam Lantinga
   186.5      slouken@libsdl.org
   186.6  */
   186.7 +#include "SDL_config.h"
   186.8  
   186.9  /* Semaphore functions using the OS/2 API */
  186.10  
   187.1 --- a/src/thread/os2/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   187.2 +++ b/src/thread/os2/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   187.3 @@ -19,6 +19,7 @@
   187.4      Sam Lantinga
   187.5      slouken@libsdl.org
   187.6  */
   187.7 +#include "SDL_config.h"
   187.8  
   187.9  /* OS/2 thread management routines for SDL */
  187.10  
   188.1 --- a/src/thread/os2/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   188.2 +++ b/src/thread/os2/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   188.3 @@ -19,6 +19,7 @@
   188.4      Sam Lantinga
   188.5      slouken@libsdl.org
   188.6  */
   188.7 +#include "SDL_config.h"
   188.8  
   188.9  #define INCL_DOSPROCESS
  188.10  #include <os2.h>
   189.1 --- a/src/thread/pth/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   189.2 +++ b/src/thread/pth/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   189.3 @@ -1,3 +1,26 @@
   189.4 +/*
   189.5 +    SDL - Simple DirectMedia Layer
   189.6 +    Copyright (C) 1997-2006 Sam Lantinga
   189.7 +
   189.8 +    This library is free software; you can redistribute it and/or
   189.9 +    modify it under the terms of the GNU Lesser General Public
  189.10 +    License as published by the Free Software Foundation; either
  189.11 +    version 2.1 of the License, or (at your option) any later version.
  189.12 +
  189.13 +    This library is distributed in the hope that it will be useful,
  189.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  189.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  189.16 +    Lesser General Public License for more details.
  189.17 +
  189.18 +    You should have received a copy of the GNU Lesser General Public
  189.19 +    License along with this library; if not, write to the Free Software
  189.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  189.21 +
  189.22 +    Sam Lantinga
  189.23 +    slouken@libsdl.org
  189.24 +*/
  189.25 +#include "SDL_config.h"
  189.26 +
  189.27  /*
  189.28   *	GNU pth conditions variables
  189.29   *
   190.1 --- a/src/thread/pth/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   190.2 +++ b/src/thread/pth/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   190.3 @@ -1,3 +1,26 @@
   190.4 +/*
   190.5 +    SDL - Simple DirectMedia Layer
   190.6 +    Copyright (C) 1997-2006 Sam Lantinga
   190.7 +
   190.8 +    This library is free software; you can redistribute it and/or
   190.9 +    modify it under the terms of the GNU Lesser General Public
  190.10 +    License as published by the Free Software Foundation; either
  190.11 +    version 2.1 of the License, or (at your option) any later version.
  190.12 +
  190.13 +    This library is distributed in the hope that it will be useful,
  190.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  190.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  190.16 +    Lesser General Public License for more details.
  190.17 +
  190.18 +    You should have received a copy of the GNU Lesser General Public
  190.19 +    License along with this library; if not, write to the Free Software
  190.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  190.21 +
  190.22 +    Sam Lantinga
  190.23 +    slouken@libsdl.org
  190.24 +*/
  190.25 +#include "SDL_config.h"
  190.26 +
  190.27  /*
  190.28   *	GNU pth mutexes
  190.29   *
   191.1 --- a/src/thread/pth/SDL_sysmutex_c.h	Tue Feb 21 08:34:45 2006 +0000
   191.2 +++ b/src/thread/pth/SDL_sysmutex_c.h	Tue Feb 21 08:46:50 2006 +0000
   191.3 @@ -1,3 +1,26 @@
   191.4 +/*
   191.5 +    SDL - Simple DirectMedia Layer
   191.6 +    Copyright (C) 1997-2006 Sam Lantinga
   191.7 +
   191.8 +    This library is free software; you can redistribute it and/or
   191.9 +    modify it under the terms of the GNU Lesser General Public
  191.10 +    License as published by the Free Software Foundation; either
  191.11 +    version 2.1 of the License, or (at your option) any later version.
  191.12 +
  191.13 +    This library is distributed in the hope that it will be useful,
  191.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  191.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  191.16 +    Lesser General Public License for more details.
  191.17 +
  191.18 +    You should have received a copy of the GNU Lesser General Public
  191.19 +    License along with this library; if not, write to the Free Software
  191.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  191.21 +
  191.22 +    Sam Lantinga
  191.23 +    slouken@libsdl.org
  191.24 +*/
  191.25 +#include "SDL_config.h"
  191.26 +
  191.27  #ifndef _SDL_SYSMUTEX_C_H_
  191.28  #define _SDL_SYSMUTEX_C_H_
  191.29  
   192.1 --- a/src/thread/pth/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   192.2 +++ b/src/thread/pth/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   192.3 @@ -19,6 +19,7 @@
   192.4      Sam Lantinga
   192.5      slouken@libsdl.org
   192.6  */
   192.7 +#include "SDL_config.h"
   192.8  
   192.9  /*
  192.10   *	GNU pth threads
   193.1 --- a/src/thread/pth/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   193.2 +++ b/src/thread/pth/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   193.3 @@ -19,6 +19,7 @@
   193.4      Sam Lantinga
   193.5      slouken@libsdl.org
   193.6  */
   193.7 +#include "SDL_config.h"
   193.8  
   193.9  #ifndef _SDL_SYSTHREAD_C_H_
  193.10  #define _SDL_SYSTHREAD_C_H_
   194.1 --- a/src/thread/pthread/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   194.2 +++ b/src/thread/pthread/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   194.3 @@ -19,6 +19,7 @@
   194.4      Sam Lantinga
   194.5      slouken@libsdl.org
   194.6  */
   194.7 +#include "SDL_config.h"
   194.8  
   194.9  #include <sys/time.h>
  194.10  #include <unistd.h>
   195.1 --- a/src/thread/pthread/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   195.2 +++ b/src/thread/pthread/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   195.3 @@ -19,6 +19,7 @@
   195.4      Sam Lantinga
   195.5      slouken@libsdl.org
   195.6  */
   195.7 +#include "SDL_config.h"
   195.8  
   195.9  #include <pthread.h>
  195.10  
   196.1 --- a/src/thread/pthread/SDL_sysmutex_c.h	Tue Feb 21 08:34:45 2006 +0000
   196.2 +++ b/src/thread/pthread/SDL_sysmutex_c.h	Tue Feb 21 08:46:50 2006 +0000
   196.3 @@ -19,6 +19,7 @@
   196.4      Sam Lantinga
   196.5      slouken@libsdl.org
   196.6  */
   196.7 +#include "SDL_config.h"
   196.8  
   196.9  #ifndef _SDL_mutex_c_h
  196.10  #define _SDL_mutex_c_h
   197.1 --- a/src/thread/pthread/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   197.2 +++ b/src/thread/pthread/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   197.3 @@ -19,6 +19,7 @@
   197.4      Sam Lantinga
   197.5      slouken@libsdl.org
   197.6  */
   197.7 +#include "SDL_config.h"
   197.8  
   197.9  #include <pthread.h>
  197.10  #include <semaphore.h>
  197.11 @@ -28,9 +29,9 @@
  197.12  
  197.13  /* Wrapper around POSIX 1003.1b semaphores */
  197.14  
  197.15 -#if MACOSX
  197.16 +#ifdef __MACOSX__
  197.17  #define USE_NAMED_SEMAPHORES 1
  197.18 -#endif /* MACOSX */
  197.19 +#endif
  197.20  
  197.21  struct SDL_semaphore {
  197.22  	sem_t *sem;
   198.1 --- a/src/thread/pthread/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   198.2 +++ b/src/thread/pthread/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   198.3 @@ -19,6 +19,7 @@
   198.4      Sam Lantinga
   198.5      slouken@libsdl.org
   198.6  */
   198.7 +#include "SDL_config.h"
   198.8  
   198.9  #include <pthread.h>
  198.10  #include <signal.h>
  198.11 @@ -96,7 +97,7 @@
  198.12  #ifdef PTHREAD_CANCEL_ASYNCHRONOUS
  198.13  	pthread_cancel(thread->handle);
  198.14  #else
  198.15 -#ifdef __FreeBSD__
  198.16 +#ifdef __FREEBSD__
  198.17  #warning For some reason, this doesnt actually kill a thread - FreeBSD 3.2
  198.18  #endif
  198.19  	pthread_kill(thread->handle, SIGKILL);
   199.1 --- a/src/thread/pthread/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   199.2 +++ b/src/thread/pthread/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   199.3 @@ -19,6 +19,7 @@
   199.4      Sam Lantinga
   199.5      slouken@libsdl.org
   199.6  */
   199.7 +#include "SDL_config.h"
   199.8  
   199.9  #include <pthread.h>
  199.10  
   200.1 --- a/src/thread/riscos/SDL_syscond.c	Tue Feb 21 08:34:45 2006 +0000
   200.2 +++ b/src/thread/riscos/SDL_syscond.c	Tue Feb 21 08:46:50 2006 +0000
   200.3 @@ -19,6 +19,7 @@
   200.4      Sam Lantinga
   200.5      slouken@libsdl.org
   200.6  */
   200.7 +#include "SDL_config.h"
   200.8  
   200.9  /* RISC OS implementations uses pthreads based on linux code */
  200.10  
   201.1 --- a/src/thread/riscos/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   201.2 +++ b/src/thread/riscos/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   201.3 @@ -19,6 +19,7 @@
   201.4      Sam Lantinga
   201.5      slouken@libsdl.org
   201.6  */
   201.7 +#include "SDL_config.h"
   201.8  
   201.9  /* RISC OS implementations uses pthreads based on linux code */
  201.10  
   202.1 --- a/src/thread/riscos/SDL_sysmutex_c.h	Tue Feb 21 08:34:45 2006 +0000
   202.2 +++ b/src/thread/riscos/SDL_sysmutex_c.h	Tue Feb 21 08:46:50 2006 +0000
   202.3 @@ -19,6 +19,7 @@
   202.4      Sam Lantinga
   202.5      slouken@libsdl.org
   202.6  */
   202.7 +#include "SDL_config.h"
   202.8  
   202.9  #ifndef _SDL_mutex_c_h
  202.10  #define _SDL_mutex_c_h
   203.1 --- a/src/thread/riscos/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   203.2 +++ b/src/thread/riscos/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   203.3 @@ -19,6 +19,7 @@
   203.4      Sam Lantinga
   203.5      slouken@libsdl.org
   203.6  */
   203.7 +#include "SDL_config.h"
   203.8  
   203.9  /* RISC OS semiphores based on linux code */
  203.10  
   204.1 --- a/src/thread/riscos/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   204.2 +++ b/src/thread/riscos/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   204.3 @@ -19,6 +19,7 @@
   204.4      Sam Lantinga
   204.5      slouken@libsdl.org
   204.6  */
   204.7 +#include "SDL_config.h"
   204.8  
   204.9  /* RISC OS version based on pthreads linux source */
  204.10  
   205.1 --- a/src/thread/riscos/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   205.2 +++ b/src/thread/riscos/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   205.3 @@ -19,6 +19,7 @@
   205.4      Sam Lantinga
   205.5      slouken@libsdl.org
   205.6  */
   205.7 +#include "SDL_config.h"
   205.8  
   205.9  #if SDL_THREADS_DISABLED
  205.10  
   206.1 --- a/src/thread/win32/SDL_sysmutex.c	Tue Feb 21 08:34:45 2006 +0000
   206.2 +++ b/src/thread/win32/SDL_sysmutex.c	Tue Feb 21 08:46:50 2006 +0000
   206.3 @@ -19,6 +19,7 @@
   206.4      Sam Lantinga
   206.5      slouken@libsdl.org
   206.6  */
   206.7 +#include "SDL_config.h"
   206.8  
   206.9  /* Mutex functions using the Win32 API */
  206.10  
   207.1 --- a/src/thread/win32/SDL_syssem.c	Tue Feb 21 08:34:45 2006 +0000
   207.2 +++ b/src/thread/win32/SDL_syssem.c	Tue Feb 21 08:46:50 2006 +0000
   207.3 @@ -19,6 +19,7 @@
   207.4      Sam Lantinga
   207.5      slouken@libsdl.org
   207.6  */
   207.7 +#include "SDL_config.h"
   207.8  
   207.9  /* Semaphore functions using the Win32 API */
  207.10  
   208.1 --- a/src/thread/win32/SDL_systhread.c	Tue Feb 21 08:34:45 2006 +0000
   208.2 +++ b/src/thread/win32/SDL_systhread.c	Tue Feb 21 08:46:50 2006 +0000
   208.3 @@ -19,6 +19,7 @@
   208.4      Sam Lantinga
   208.5      slouken@libsdl.org
   208.6  */
   208.7 +#include "SDL_config.h"
   208.8  
   208.9  /* Win32 thread management routines for SDL */
  208.10  
   209.1 --- a/src/thread/win32/SDL_systhread_c.h	Tue Feb 21 08:34:45 2006 +0000
   209.2 +++ b/src/thread/win32/SDL_systhread_c.h	Tue Feb 21 08:46:50 2006 +0000
   209.3 @@ -19,6 +19,7 @@
   209.4      Sam Lantinga
   209.5      slouken@libsdl.org
   209.6  */
   209.7 +#include "SDL_config.h"
   209.8  
   209.9  #include "SDL_windows.h"
  209.10  
   210.1 --- a/src/timer/SDL_systimer.h	Tue Feb 21 08:34:45 2006 +0000
   210.2 +++ b/src/timer/SDL_systimer.h	Tue Feb 21 08:46:50 2006 +0000
   210.3 @@ -19,6 +19,7 @@
   210.4      Sam Lantinga
   210.5      slouken@libsdl.org
   210.6  */
   210.7 +#include "SDL_config.h"
   210.8  
   210.9  /* The system dependent timer handling functions */
  210.10  
   211.1 --- a/src/timer/SDL_timer.c	Tue Feb 21 08:34:45 2006 +0000
   211.2 +++ b/src/timer/SDL_timer.c	Tue Feb 21 08:46:50 2006 +0000
   211.3 @@ -19,6 +19,7 @@
   211.4      Sam Lantinga
   211.5      slouken@libsdl.org
   211.6  */
   211.7 +#include "SDL_config.h"
   211.8  
   211.9  #include "SDL_timer.h"
  211.10  #include "SDL_timer_c.h"
   212.1 --- a/src/timer/SDL_timer_c.h	Tue Feb 21 08:34:45 2006 +0000
   212.2 +++ b/src/timer/SDL_timer_c.h	Tue Feb 21 08:46:50 2006 +0000
   212.3 @@ -19,6 +19,7 @@
   212.4      Sam Lantinga
   212.5      slouken@libsdl.org
   212.6  */
   212.7 +#include "SDL_config.h"
   212.8  
   212.9  /* Useful functions and variables from SDL_timer.c */
  212.10  #include "SDL_timer.h"
   213.1 --- a/src/timer/amigaos/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   213.2 +++ b/src/timer/amigaos/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   213.3 @@ -19,6 +19,7 @@
   213.4      Sam Lantinga
   213.5      slouken@libsdl.org
   213.6  */
   213.7 +#include "SDL_config.h"
   213.8  
   213.9  #include <stdio.h>
  213.10  #include <time.h>
   214.1 --- a/src/timer/beos/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   214.2 +++ b/src/timer/beos/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   214.3 @@ -19,6 +19,7 @@
   214.4      Sam Lantinga
   214.5      slouken@libsdl.org
   214.6  */
   214.7 +#include "SDL_config.h"
   214.8  
   214.9  #include <be/kernel/OS.h>
  214.10  
   215.1 --- a/src/timer/dc/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   215.2 +++ b/src/timer/dc/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   215.3 @@ -19,6 +19,7 @@
   215.4      Sam Lantinga
   215.5      slouken@libsdl.org
   215.6  */
   215.7 +#include "SDL_config.h"
   215.8  
   215.9  #include <kos.h>
  215.10  
   216.1 --- a/src/timer/dummy/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   216.2 +++ b/src/timer/dummy/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   216.3 @@ -19,6 +19,7 @@
   216.4      Sam Lantinga
   216.5      slouken@libsdl.org
   216.6  */
   216.7 +#include "SDL_config.h"
   216.8  
   216.9  void SDL_StartTicks(void)
  216.10  {
   217.1 --- a/src/timer/macos/FastTimes.h	Tue Feb 21 08:34:45 2006 +0000
   217.2 +++ b/src/timer/macos/FastTimes.h	Tue Feb 21 08:46:50 2006 +0000
   217.3 @@ -1,4 +1,5 @@
   217.4  /* File "FastTimes.h" - Original code by Matt Slot <fprefect@ambrosiasw.com>  */
   217.5 +#include "SDL_config.h"
   217.6  /* Created 4/24/99    - This file is hereby placed in the public domain       */
   217.7  /* Updated 5/21/99    - Calibrate to VIA, add TBR support, renamed functions  */
   217.8  /* Updated 10/4/99    - Use AbsoluteToNanoseconds() in case Absolute = double */
   217.9 @@ -23,4 +24,4 @@
  217.10  /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */
  217.11  /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */
  217.12  
  217.13 -#endif /* __FAST_TIMES_HEADER__ */
  217.14 \ No newline at end of file
  217.15 +#endif /* __FAST_TIMES_HEADER__ */
   218.1 --- a/src/timer/macos/SDL_MPWtimer.c	Tue Feb 21 08:34:45 2006 +0000
   218.2 +++ b/src/timer/macos/SDL_MPWtimer.c	Tue Feb 21 08:46:50 2006 +0000
   218.3 @@ -19,6 +19,7 @@
   218.4      Sam Lantinga
   218.5      slouken@libsdl.org
   218.6  */
   218.7 +#include "SDL_config.h"
   218.8  
   218.9  #include <Types.h>
  218.10  #include <Timer.h>
   219.1 --- a/src/timer/macos/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   219.2 +++ b/src/timer/macos/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   219.3 @@ -19,6 +19,7 @@
   219.4      Sam Lantinga
   219.5      slouken@libsdl.org
   219.6  */
   219.7 +#include "SDL_config.h"
   219.8  
   219.9  #include <Types.h>
  219.10  #include <Timer.h>
   220.1 --- a/src/timer/mint/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   220.2 +++ b/src/timer/mint/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   220.3 @@ -19,6 +19,7 @@
   220.4      Sam Lantinga
   220.5      slouken@libsdl.org
   220.6  */
   220.7 +#include "SDL_config.h"
   220.8  
   220.9  /*
  220.10   *	TOS/MiNT timer driver
   221.1 --- a/src/timer/mint/SDL_vbltimer_s.h	Tue Feb 21 08:34:45 2006 +0000
   221.2 +++ b/src/timer/mint/SDL_vbltimer_s.h	Tue Feb 21 08:46:50 2006 +0000
   221.3 @@ -19,6 +19,7 @@
   221.4      Sam Lantinga
   221.5      slouken@libsdl.org
   221.6  */
   221.7 +#include "SDL_config.h"
   221.8  
   221.9  /*
  221.10   *	TOS/MiNT timer driver
   222.1 --- a/src/timer/os2/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   222.2 +++ b/src/timer/os2/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   222.3 @@ -19,6 +19,7 @@
   222.4      Sam Lantinga
   222.5      slouken@libsdl.org
   222.6  */
   222.7 +#include "SDL_config.h"
   222.8  
   222.9  #define INCL_DOSMISC
  222.10  #define INCL_DOSERRORS
   223.1 --- a/src/timer/riscos/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   223.2 +++ b/src/timer/riscos/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   223.3 @@ -19,6 +19,7 @@
   223.4      Sam Lantinga
   223.5      slouken@libsdl.org
   223.6  */
   223.7 +#include "SDL_config.h"
   223.8  
   223.9  #include <stdio.h>
  223.10  #include <time.h>
   224.1 --- a/src/timer/unix/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   224.2 +++ b/src/timer/unix/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   224.3 @@ -19,6 +19,7 @@
   224.4      Sam Lantinga
   224.5      slouken@libsdl.org
   224.6  */
   224.7 +#include "SDL_config.h"
   224.8  
   224.9  #include <stdio.h>
  224.10  #include <sys/time.h>
   225.1 --- a/src/timer/win32/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   225.2 +++ b/src/timer/win32/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   225.3 @@ -19,6 +19,7 @@
   225.4      Sam Lantinga
   225.5      slouken@libsdl.org
   225.6  */
   225.7 +#include "SDL_config.h"
   225.8  
   225.9  #include "SDL_windows.h"
  225.10  #include <mmsystem.h>
   226.1 --- a/src/timer/wince/SDL_systimer.c	Tue Feb 21 08:34:45 2006 +0000
   226.2 +++ b/src/timer/wince/SDL_systimer.c	Tue Feb 21 08:46:50 2006 +0000
   226.3 @@ -19,6 +19,7 @@
   226.4      Sam Lantinga
   226.5      slouken@libsdl.org
   226.6  */
   226.7 +#include "SDL_config.h"
   226.8  
   226.9  #include "SDL_windows.h"
  226.10  #include <mmsystem.h>
   227.1 --- a/src/video/SDL_RLEaccel.c	Tue Feb 21 08:34:45 2006 +0000
   227.2 +++ b/src/video/SDL_RLEaccel.c	Tue Feb 21 08:46:50 2006 +0000
   227.3 @@ -19,6 +19,7 @@
   227.4      Sam Lantinga
   227.5      slouken@libsdl.org
   227.6  */
   227.7 +#include "SDL_config.h"
   227.8  
   227.9  /*
  227.10   * RLE encoding for software colorkey and alpha-channel acceleration
  227.11 @@ -90,7 +91,7 @@
  227.12  #include "SDL_blit.h"
  227.13  #include "SDL_RLEaccel_c.h"
  227.14  
  227.15 -#if (i386 || __x86_64__) && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  227.16 +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES
  227.17  #define MMX_ASMBLIT
  227.18  #endif
  227.19  
   228.1 --- a/src/video/SDL_RLEaccel_c.h	Tue Feb 21 08:34:45 2006 +0000
   228.2 +++ b/src/video/SDL_RLEaccel_c.h	Tue Feb 21 08:46:50 2006 +0000
   228.3 @@ -19,6 +19,7 @@
   228.4      Sam Lantinga
   228.5      slouken@libsdl.org
   228.6  */
   228.7 +#include "SDL_config.h"
   228.8  
   228.9  /* Useful functions and variables from SDL_RLEaccel.c */
  228.10  
   229.1 --- a/src/video/SDL_blit.c	Tue Feb 21 08:34:45 2006 +0000
   229.2 +++ b/src/video/SDL_blit.c	Tue Feb 21 08:46:50 2006 +0000
   229.3 @@ -19,6 +19,7 @@
   229.4      Sam Lantinga
   229.5      slouken@libsdl.org
   229.6  */
   229.7 +#include "SDL_config.h"
   229.8  
   229.9  #include "SDL_video.h"
  229.10  #include "SDL_sysvideo.h"
  229.11 @@ -26,7 +27,7 @@
  229.12  #include "SDL_RLEaccel_c.h"
  229.13  #include "SDL_pixels_c.h"
  229.14  
  229.15 -#if (i386 || __x86_64__) && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  229.16 +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES
  229.17  #define MMX_ASMBLIT
  229.18  #endif
  229.19  
   230.1 --- a/src/video/SDL_blit.h	Tue Feb 21 08:34:45 2006 +0000
   230.2 +++ b/src/video/SDL_blit.h	Tue Feb 21 08:46:50 2006 +0000
   230.3 @@ -19,6 +19,7 @@
   230.4      Sam Lantinga
   230.5      slouken@libsdl.org
   230.6  */
   230.7 +#include "SDL_config.h"
   230.8  
   230.9  #ifndef _SDL_blit_h
  230.10  #define _SDL_blit_h
   231.1 --- a/src/video/SDL_blit_0.c	Tue Feb 21 08:34:45 2006 +0000
   231.2 +++ b/src/video/SDL_blit_0.c	Tue Feb 21 08:46:50 2006 +0000
   231.3 @@ -19,6 +19,7 @@
   231.4      Sam Lantinga
   231.5      slouken@libsdl.org
   231.6  */
   231.7 +#include "SDL_config.h"
   231.8  
   231.9  #include "SDL_video.h"
  231.10  #include "SDL_blit.h"
   232.1 --- a/src/video/SDL_blit_1.c	Tue Feb 21 08:34:45 2006 +0000
   232.2 +++ b/src/video/SDL_blit_1.c	Tue Feb 21 08:46:50 2006 +0000
   232.3 @@ -19,6 +19,7 @@
   232.4      Sam Lantinga
   232.5      slouken@libsdl.org
   232.6  */
   232.7 +#include "SDL_config.h"
   232.8  
   232.9  #include "SDL_video.h"
  232.10  #include "SDL_blit.h"
   233.1 --- a/src/video/SDL_blit_A.c	Tue Feb 21 08:34:45 2006 +0000
   233.2 +++ b/src/video/SDL_blit_A.c	Tue Feb 21 08:46:50 2006 +0000
   233.3 @@ -19,11 +19,12 @@
   233.4      Sam Lantinga
   233.5      slouken@libsdl.org
   233.6  */
   233.7 +#include "SDL_config.h"
   233.8  
   233.9  #include "SDL_video.h"
  233.10  #include "SDL_blit.h"
  233.11  
  233.12 -#if (defined(i386) || defined(__x86_64__)) && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  233.13 +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES
  233.14  #define MMX_ASMBLIT 1
  233.15  #endif
  233.16  
  233.17 @@ -419,7 +420,7 @@
  233.18  #endif
  233.19  #include <assert.h>
  233.20  
  233.21 -#if ((defined MACOSX) && (__GNUC__ < 4))
  233.22 +#if (defined(__MACOSX__) && (__GNUC__ < 4))
  233.23      #define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
  233.24          (vector unsigned char) ( a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p )
  233.25      #define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \
   234.1 --- a/src/video/SDL_blit_N.c	Tue Feb 21 08:34:45 2006 +0000
   234.2 +++ b/src/video/SDL_blit_N.c	Tue Feb 21 08:46:50 2006 +0000
   234.3 @@ -19,6 +19,7 @@
   234.4      Sam Lantinga
   234.5      slouken@libsdl.org
   234.6  */
   234.7 +#include "SDL_config.h"
   234.8  
   234.9  #include "SDL_video.h"
  234.10  #include "SDL_endian.h"
  234.11 @@ -32,7 +33,7 @@
  234.12  #include <altivec.h>
  234.13  #endif
  234.14  #define assert(X)
  234.15 -#ifdef MACOSX
  234.16 +#ifdef __MACOSX__
  234.17  #include <sys/sysctl.h>
  234.18  static size_t GetL3CacheSize( void )
  234.19  {
  234.20 @@ -52,9 +53,9 @@
  234.21      /* XXX: Just guess G4 */
  234.22      return 2097152;
  234.23  }
  234.24 -#endif /* MACOSX */
  234.25 +#endif /* __MACOSX__ */
  234.26  
  234.27 -#if ((defined MACOSX) && (__GNUC__ < 4))
  234.28 +#if (defined(__MACOSX__) && (__GNUC__ < 4))
  234.29      #define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
  234.30          (vector unsigned char) ( a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p )
  234.31      #define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \
   235.1 --- a/src/video/SDL_bmp.c	Tue Feb 21 08:34:45 2006 +0000
   235.2 +++ b/src/video/SDL_bmp.c	Tue Feb 21 08:46:50 2006 +0000
   235.3 @@ -19,6 +19,7 @@
   235.4      Sam Lantinga
   235.5      slouken@libsdl.org
   235.6  */
   235.7 +#include "SDL_config.h"
   235.8  
   235.9  /* 
  235.10     Code to load and save surfaces in Windows BMP format.
   236.1 --- a/src/video/SDL_cursor.c	Tue Feb 21 08:34:45 2006 +0000
   236.2 +++ b/src/video/SDL_cursor.c	Tue Feb 21 08:46:50 2006 +0000
   236.3 @@ -19,6 +19,7 @@
   236.4      Sam Lantinga
   236.5      slouken@libsdl.org
   236.6  */
   236.7 +#include "SDL_config.h"
   236.8  
   236.9  /* General cursor handling code for SDL */
  236.10  
   237.1 --- a/src/video/SDL_cursor_c.h	Tue Feb 21 08:34:45 2006 +0000
   237.2 +++ b/src/video/SDL_cursor_c.h	Tue Feb 21 08:46:50 2006 +0000
   237.3 @@ -19,6 +19,7 @@
   237.4      Sam Lantinga
   237.5      slouken@libsdl.org
   237.6  */
   237.7 +#include "SDL_config.h"
   237.8  
   237.9  /* Useful variables and functions from SDL_cursor.c */
  237.10  #include "SDL_mouse.h"
   238.1 --- a/src/video/SDL_gamma.c	Tue Feb 21 08:34:45 2006 +0000
   238.2 +++ b/src/video/SDL_gamma.c	Tue Feb 21 08:46:50 2006 +0000
   238.3 @@ -19,11 +19,10 @@
   238.4      Sam Lantinga
   238.5      slouken@libsdl.org
   238.6  */
   238.7 +#include "SDL_config.h"
   238.8  
   238.9  /* Gamma correction support */
  238.10  
  238.11 -#include "SDL_config.h"
  238.12 -
  238.13  #ifdef HAVE_MATH_H
  238.14  #include <math.h>	/* Used for calculating gamma ramps */
  238.15  #else
   239.1 --- a/src/video/SDL_leaks.h	Tue Feb 21 08:34:45 2006 +0000
   239.2 +++ b/src/video/SDL_leaks.h	Tue Feb 21 08:46:50 2006 +0000
   239.3 @@ -19,6 +19,7 @@
   239.4      Sam Lantinga
   239.5      slouken@libsdl.org
   239.6  */
   239.7 +#include "SDL_config.h"
   239.8  
   239.9  /* Define this if you want surface leak detection code enabled */
  239.10  /*#define CHECK_LEAKS*/
   240.1 --- a/src/video/SDL_pixels.c	Tue Feb 21 08:34:45 2006 +0000
   240.2 +++ b/src/video/SDL_pixels.c	Tue Feb 21 08:46:50 2006 +0000
   240.3 @@ -19,6 +19,7 @@
   240.4      Sam Lantinga
   240.5      slouken@libsdl.org
   240.6  */
   240.7 +#include "SDL_config.h"
   240.8  
   240.9  /* General (mostly internal) pixel/color manipulation routines for SDL */
  240.10  
   241.1 --- a/src/video/SDL_pixels_c.h	Tue Feb 21 08:34:45 2006 +0000
   241.2 +++ b/src/video/SDL_pixels_c.h	Tue Feb 21 08:46:50 2006 +0000
   241.3 @@ -19,6 +19,7 @@
   241.4      Sam Lantinga
   241.5      slouken@libsdl.org
   241.6  */
   241.7 +#include "SDL_config.h"
   241.8  
   241.9  /* Useful functions and variables from SDL_pixel.c */
  241.10  
   242.1 --- a/src/video/SDL_stretch.c	Tue Feb 21 08:34:45 2006 +0000
   242.2 +++ b/src/video/SDL_stretch.c	Tue Feb 21 08:46:50 2006 +0000
   242.3 @@ -19,6 +19,7 @@
   242.4      Sam Lantinga
   242.5      slouken@libsdl.org
   242.6  */
   242.7 +#include "SDL_config.h"
   242.8  
   242.9  /* This a stretch blit implementation based on ideas given to me by
  242.10     Tomasz Cejner - thanks! :)
  242.11 @@ -34,7 +35,7 @@
  242.12  */
  242.13  
  242.14  #if ((defined(_MFC_VER) && defined(_M_IX86)/* && !defined(_WIN32_WCE) still needed? */) || \
  242.15 -     (defined(i386) && defined(__GNUC__))) && SDL_ASSEMBLY_BLITTERS
  242.16 +     (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
  242.17  #define USE_ASM_STRETCH
  242.18  #endif
  242.19  
   243.1 --- a/src/video/SDL_stretch_c.h	Tue Feb 21 08:34:45 2006 +0000
   243.2 +++ b/src/video/SDL_stretch_c.h	Tue Feb 21 08:46:50 2006 +0000
   243.3 @@ -19,6 +19,7 @@
   243.4      Sam Lantinga
   243.5      slouken@libsdl.org
   243.6  */
   243.7 +#include "SDL_config.h"
   243.8  
   243.9  /* Perform a stretch blit between two surfaces of the same format.
  243.10     NOTE:  This function is not safe to call from multiple threads!
   244.1 --- a/src/video/SDL_surface.c	Tue Feb 21 08:34:45 2006 +0000
   244.2 +++ b/src/video/SDL_surface.c	Tue Feb 21 08:46:50 2006 +0000
   244.3 @@ -19,6 +19,7 @@
   244.4      Sam Lantinga
   244.5      slouken@libsdl.org
   244.6  */
   244.7 +#include "SDL_config.h"
   244.8  
   244.9  #include "SDL_video.h"
  244.10  #include "SDL_sysvideo.h"
   245.1 --- a/src/video/SDL_sysvideo.h	Tue Feb 21 08:34:45 2006 +0000
   245.2 +++ b/src/video/SDL_sysvideo.h	Tue Feb 21 08:46:50 2006 +0000
   245.3 @@ -19,6 +19,7 @@
   245.4      Sam Lantinga
   245.5      slouken@libsdl.org
   245.6  */
   245.7 +#include "SDL_config.h"
   245.8  
   245.9  #ifndef _SDL_sysvideo_h
  245.10  #define _SDL_sysvideo_h
  245.11 @@ -32,17 +33,8 @@
  245.12     This is designed to be easily converted to C++ in the future.
  245.13   */
  245.14  
  245.15 -/* OpenGL is pretty much available on all Windows systems */
  245.16 -#ifdef WIN32
  245.17 -#include "SDL_windows.h"
  245.18 -#endif
  245.19 -
  245.20  #if SDL_VIDEO_OPENGL
  245.21 -#ifdef MACOSX
  245.22 -#include <OpenGL/gl.h>  /* OpenGL.framework */
  245.23 -#else
  245.24 -#include <GL/gl.h>
  245.25 -#endif /* MACOSX */
  245.26 +#include "SDL_opengl.h"
  245.27  #endif /* SDL_VIDEO_OPENGL */
  245.28  
  245.29  /* The SDL video driver */
   246.1 --- a/src/video/SDL_video.c	Tue Feb 21 08:34:45 2006 +0000
   246.2 +++ b/src/video/SDL_video.c	Tue Feb 21 08:46:50 2006 +0000
   246.3 @@ -19,6 +19,7 @@
   246.4      Sam Lantinga
   246.5      slouken@libsdl.org
   246.6  */
   246.7 +#include "SDL_config.h"
   246.8  
   246.9  /* The high-level video driver subsystem */
  246.10  
  246.11 @@ -356,7 +357,7 @@
  246.12  };
  246.13  
  246.14  
  246.15 -#ifdef macintosh /* MPW optimization bug? */
  246.16 +#ifdef __MACOS__ /* MPW optimization bug? */
  246.17  #define NEGATIVE_ONE 0xFFFFFFFF
  246.18  #else
  246.19  #define NEGATIVE_ONE -1
   247.1 --- a/src/video/SDL_yuv.c	Tue Feb 21 08:34:45 2006 +0000
   247.2 +++ b/src/video/SDL_yuv.c	Tue Feb 21 08:46:50 2006 +0000
   247.3 @@ -19,6 +19,7 @@
   247.4      Sam Lantinga
   247.5      slouken@libsdl.org
   247.6  */
   247.7 +#include "SDL_config.h"
   247.8  
   247.9  /* This is the implementation of the YUV video surface support */
  247.10  
   248.1 --- a/src/video/SDL_yuv_mmx.c	Tue Feb 21 08:34:45 2006 +0000
   248.2 +++ b/src/video/SDL_yuv_mmx.c	Tue Feb 21 08:46:50 2006 +0000
   248.3 @@ -19,10 +19,9 @@
   248.4      Sam Lantinga
   248.5      slouken@libsdl.org
   248.6  */
   248.7 +#include "SDL_config.h"
   248.8  
   248.9 -#include "SDL_stdinc.h"
  248.10 -
  248.11 -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  248.12 +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
  248.13  
  248.14  #define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
  248.15   
   249.1 --- a/src/video/SDL_yuv_sw.c	Tue Feb 21 08:34:45 2006 +0000
   249.2 +++ b/src/video/SDL_yuv_sw.c	Tue Feb 21 08:46:50 2006 +0000
   249.3 @@ -19,6 +19,7 @@
   249.4      Sam Lantinga
   249.5      slouken@libsdl.org
   249.6  */
   249.7 +#include "SDL_config.h"
   249.8  
   249.9  /* This is the software implementation of the YUV video overlay support */
  249.10  
  249.11 @@ -1058,7 +1059,7 @@
  249.12  	    case SDL_YV12_OVERLAY:
  249.13  	    case SDL_IYUV_OVERLAY:
  249.14  		if ( display->format->BytesPerPixel == 2 ) {
  249.15 -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  249.16 +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
  249.17  			/* inline assembly functions */
  249.18  			if ( SDL_HasMMX() && (Rmask == 0xF800) &&
  249.19  			                     (Gmask == 0x07E0) &&
  249.20 @@ -1080,7 +1081,7 @@
  249.21  			swdata->Display2X = Color24DitherYV12Mod2X;
  249.22  		}
  249.23  		if ( display->format->BytesPerPixel == 4 ) {
  249.24 -#if i386 && __GNUC__ && SDL_ASSEMBLY_BLITTERS
  249.25 +#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
  249.26  			/* inline assembly functions */
  249.27  			if ( SDL_HasMMX() && (Rmask == 0x00FF0000) &&
  249.28  			                     (Gmask == 0x0000FF00) &&
   250.1 --- a/src/video/SDL_yuv_sw_c.h	Tue Feb 21 08:34:45 2006 +0000
   250.2 +++ b/src/video/SDL_yuv_sw_c.h	Tue Feb 21 08:46:50 2006 +0000
   250.3 @@ -19,6 +19,7 @@
   250.4      Sam Lantinga
   250.5      slouken@libsdl.org
   250.6  */
   250.7 +#include "SDL_config.h"
   250.8  
   250.9  #include "SDL_video.h"
  250.10  #include "SDL_sysvideo.h"
   251.1 --- a/src/video/SDL_yuvfuncs.h	Tue Feb 21 08:34:45 2006 +0000
   251.2 +++ b/src/video/SDL_yuvfuncs.h	Tue Feb 21 08:46:50 2006 +0000
   251.3 @@ -19,6 +19,7 @@
   251.4      Sam Lantinga
   251.5      slouken@libsdl.org
   251.6  */
   251.7 +#include "SDL_config.h"
   251.8  
   251.9  /* This is the definition of the YUV video surface function structure */
  251.10  
   252.1 --- a/src/video/aalib/SDL_aaevents.c	Tue Feb 21 08:34:45 2006 +0000
   252.2 +++ b/src/video/aalib/SDL_aaevents.c	Tue Feb 21 08:46:50 2006 +0000
   252.3 @@ -19,6 +19,7 @@
   252.4      Sam Lantinga
   252.5      slouken@libsdl.org
   252.6  */
   252.7 +#include "SDL_config.h"
   252.8  
   252.9  /* Handle the event stream, converting AA events into SDL events */
  252.10  
   253.1 --- a/src/video/aalib/SDL_aaevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   253.2 +++ b/src/video/aalib/SDL_aaevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   253.3 @@ -19,6 +19,7 @@
   253.4      Sam Lantinga
   253.5      slouken@libsdl.org
   253.6  */
   253.7 +#include "SDL_config.h"
   253.8  
   253.9  #include "SDL_aavideo.h"
  253.10  
   254.1 --- a/src/video/aalib/SDL_aamouse.c	Tue Feb 21 08:34:45 2006 +0000
   254.2 +++ b/src/video/aalib/SDL_aamouse.c	Tue Feb 21 08:46:50 2006 +0000
   254.3 @@ -19,6 +19,7 @@
   254.4      Sam Lantinga
   254.5      slouken@libsdl.org
   254.6  */
   254.7 +#include "SDL_config.h"
   254.8  
   254.9  #include <stdio.h>
  254.10  
   255.1 --- a/src/video/aalib/SDL_aamouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   255.2 +++ b/src/video/aalib/SDL_aamouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   255.3 @@ -19,6 +19,7 @@
   255.4      Sam Lantinga
   255.5      slouken@libsdl.org
   255.6  */
   255.7 +#include "SDL_config.h"
   255.8  
   255.9  #include "SDL_aavideo.h"
  255.10  
   256.1 --- a/src/video/aalib/SDL_aavideo.c	Tue Feb 21 08:34:45 2006 +0000
   256.2 +++ b/src/video/aalib/SDL_aavideo.c	Tue Feb 21 08:46:50 2006 +0000
   256.3 @@ -19,6 +19,7 @@
   256.4      Sam Lantinga
   256.5      slouken@libsdl.org
   256.6  */
   256.7 +#include "SDL_config.h"
   256.8  
   256.9  /* AAlib based SDL video driver implementation.
  256.10  */
   257.1 --- a/src/video/aalib/SDL_aavideo.h	Tue Feb 21 08:34:45 2006 +0000
   257.2 +++ b/src/video/aalib/SDL_aavideo.h	Tue Feb 21 08:46:50 2006 +0000
   257.3 @@ -19,6 +19,7 @@
   257.4      Sam Lantinga
   257.5      slouken@libsdl.org
   257.6  */
   257.7 +#include "SDL_config.h"
   257.8  
   257.9  #ifndef _SDL_aavideo_h
  257.10  #define _SDL_aavideo_h
   258.1 --- a/src/video/ataricommon/SDL_ataric2p_s.h	Tue Feb 21 08:34:45 2006 +0000
   258.2 +++ b/src/video/ataricommon/SDL_ataric2p_s.h	Tue Feb 21 08:46:50 2006 +0000
   258.3 @@ -19,6 +19,7 @@
   258.4      Sam Lantinga
   258.5      slouken@libsdl.org
   258.6  */
   258.7 +#include "SDL_config.h"
   258.8  
   258.9  #ifndef _ATARI_C2P_h
  258.10  #define _ATARI_C2P_h
   259.1 --- a/src/video/ataricommon/SDL_atarieddi_s.h	Tue Feb 21 08:34:45 2006 +0000
   259.2 +++ b/src/video/ataricommon/SDL_atarieddi_s.h	Tue Feb 21 08:46:50 2006 +0000
   259.3 @@ -19,6 +19,7 @@
   259.4      Sam Lantinga
   259.5      slouken@libsdl.org
   259.6  */
   259.7 +#include "SDL_config.h"
   259.8  
   259.9  #ifndef _SDL_Atari_eddi_s_h
  259.10  #define _SDL_Atari_eddi_s_h
   260.1 --- a/src/video/ataricommon/SDL_atarievents.c	Tue Feb 21 08:34:45 2006 +0000
   260.2 +++ b/src/video/ataricommon/SDL_atarievents.c	Tue Feb 21 08:46:50 2006 +0000
   260.3 @@ -19,6 +19,7 @@
   260.4      Sam Lantinga
   260.5      slouken@libsdl.org
   260.6  */
   260.7 +#include "SDL_config.h"
   260.8  
   260.9  /*
  260.10   *	Atari keyboard events manager
   261.1 --- a/src/video/ataricommon/SDL_atarievents_c.h	Tue Feb 21 08:34:45 2006 +0000
   261.2 +++ b/src/video/ataricommon/SDL_atarievents_c.h	Tue Feb 21 08:46:50 2006 +0000
   261.3 @@ -19,6 +19,7 @@
   261.4      Sam Lantinga
   261.5      slouken@libsdl.org
   261.6  */
   261.7 +#include "SDL_config.h"
   261.8  
   261.9  /*
  261.10   *	Atari keyboard events manager
   262.1 --- a/src/video/ataricommon/SDL_atarigl.c	Tue Feb 21 08:34:45 2006 +0000
   262.2 +++ b/src/video/ataricommon/SDL_atarigl.c	Tue Feb 21 08:46:50 2006 +0000
   262.3 @@ -19,6 +19,7 @@
   262.4      Sam Lantinga
   262.5      slouken@libsdl.org
   262.6  */
   262.7 +#include "SDL_config.h"
   262.8  
   262.9  /* Atari OSMesa.ldg implementation of SDL OpenGL support */
  262.10  
   263.1 --- a/src/video/ataricommon/SDL_atarigl_c.h	Tue Feb 21 08:34:45 2006 +0000
   263.2 +++ b/src/video/ataricommon/SDL_atarigl_c.h	Tue Feb 21 08:46:50 2006 +0000
   263.3 @@ -19,6 +19,7 @@
   263.4      Sam Lantinga
   263.5      slouken@libsdl.org
   263.6  */
   263.7 +#include "SDL_config.h"
   263.8  
   263.9  /* Atari OSMesa.ldg implementation of SDL OpenGL support */
  263.10  
   264.1 --- a/src/video/ataricommon/SDL_atarimxalloc.c	Tue Feb 21 08:34:45 2006 +0000
   264.2 +++ b/src/video/ataricommon/SDL_atarimxalloc.c	Tue Feb 21 08:46:50 2006 +0000
   264.3 @@ -19,6 +19,7 @@
   264.4      Sam Lantinga
   264.5      slouken@libsdl.org
   264.6  */
   264.7 +#include "SDL_config.h"
   264.8  
   264.9  /*
  264.10   *	Memory allocation
   265.1 --- a/src/video/ataricommon/SDL_atarimxalloc_c.h	Tue Feb 21 08:34:45 2006 +0000
   265.2 +++ b/src/video/ataricommon/SDL_atarimxalloc_c.h	Tue Feb 21 08:46:50 2006 +0000
   265.3 @@ -19,6 +19,7 @@
   265.4      Sam Lantinga
   265.5      slouken@libsdl.org
   265.6  */
   265.7 +#include "SDL_config.h"
   265.8  
   265.9  /*
  265.10   *	Memory allocation
   266.1 --- a/src/video/ataricommon/SDL_biosevents.c	Tue Feb 21 08:34:45 2006 +0000
   266.2 +++ b/src/video/ataricommon/SDL_biosevents.c	Tue Feb 21 08:46:50 2006 +0000
   266.3 @@ -19,6 +19,7 @@
   266.4      Sam Lantinga
   266.5      slouken@libsdl.org
   266.6  */
   266.7 +#include "SDL_config.h"
   266.8  
   266.9  /*
  266.10   *	Atari keyboard events manager, using BIOS
   267.1 --- a/src/video/ataricommon/SDL_biosevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   267.2 +++ b/src/video/ataricommon/SDL_biosevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   267.3 @@ -19,6 +19,7 @@
   267.4      Sam Lantinga
   267.5      slouken@libsdl.org
   267.6  */
   267.7 +#include "SDL_config.h"
   267.8  
   267.9  /*
  267.10   *	Atari keyboard events manager, using BIOS
   268.1 --- a/src/video/ataricommon/SDL_gemdosevents.c	Tue Feb 21 08:34:45 2006 +0000
   268.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c	Tue Feb 21 08:46:50 2006 +0000
   268.3 @@ -19,6 +19,7 @@
   268.4      Sam Lantinga
   268.5      slouken@libsdl.org
   268.6  */
   268.7 +#include "SDL_config.h"
   268.8  
   268.9  /*
  268.10   *	Atari keyboard events manager, using Gemdos
   269.1 --- a/src/video/ataricommon/SDL_gemdosevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   269.2 +++ b/src/video/ataricommon/SDL_gemdosevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   269.3 @@ -19,6 +19,7 @@
   269.4      Sam Lantinga
   269.5      slouken@libsdl.org
   269.6  */
   269.7 +#include "SDL_config.h"
   269.8  
   269.9  /*
  269.10   *	Atari keyboard events manager, using Gemdos
   270.1 --- a/src/video/ataricommon/SDL_ikbdevents.c	Tue Feb 21 08:34:45 2006 +0000
   270.2 +++ b/src/video/ataricommon/SDL_ikbdevents.c	Tue Feb 21 08:46:50 2006 +0000
   270.3 @@ -19,6 +19,7 @@
   270.4      Sam Lantinga
   270.5      slouken@libsdl.org
   270.6  */
   270.7 +#include "SDL_config.h"
   270.8  
   270.9  /*
  270.10   *	Atari keyboard events manager, using hardware IKBD
   271.1 --- a/src/video/ataricommon/SDL_ikbdevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   271.2 +++ b/src/video/ataricommon/SDL_ikbdevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   271.3 @@ -19,6 +19,7 @@
   271.4      Sam Lantinga
   271.5      slouken@libsdl.org
   271.6  */
   271.7 +#include "SDL_config.h"
   271.8  
   271.9  /*
  271.10   *	Atari keyboard events manager, using hardware IKBD
   272.1 --- a/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Tue Feb 21 08:34:45 2006 +0000
   272.2 +++ b/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Tue Feb 21 08:46:50 2006 +0000
   272.3 @@ -19,6 +19,7 @@
   272.4      Sam Lantinga
   272.5      slouken@libsdl.org
   272.6  */
   272.7 +#include "SDL_config.h"
   272.8  
   272.9  /*
  272.10   *	Mouse vector
   273.1 --- a/src/video/ataricommon/SDL_xbiosevents.c	Tue Feb 21 08:34:45 2006 +0000
   273.2 +++ b/src/video/ataricommon/SDL_xbiosevents.c	Tue Feb 21 08:46:50 2006 +0000
   273.3 @@ -19,6 +19,7 @@
   273.4      Sam Lantinga
   273.5      slouken@libsdl.org
   273.6  */
   273.7 +#include "SDL_config.h"
   273.8  
   273.9  /*
  273.10   *	XBIOS mouse & joystick vectors
   274.1 --- a/src/video/ataricommon/SDL_xbiosevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   274.2 +++ b/src/video/ataricommon/SDL_xbiosevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   274.3 @@ -19,6 +19,7 @@
   274.4      Sam Lantinga
   274.5      slouken@libsdl.org
   274.6  */
   274.7 +#include "SDL_config.h"
   274.8  
   274.9  /*
  274.10   *	Xbios mouse & joystick vectors
   275.1 --- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Tue Feb 21 08:34:45 2006 +0000
   275.2 +++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Tue Feb 21 08:46:50 2006 +0000
   275.3 @@ -19,6 +19,7 @@
   275.4      Sam Lantinga
   275.5      slouken@libsdl.org
   275.6  */
   275.7 +#include "SDL_config.h"
   275.8  
   275.9  /*
  275.10   *	Mouse vector
   276.1 --- a/src/video/bwindow/SDL_BView.h	Tue Feb 21 08:34:45 2006 +0000
   276.2 +++ b/src/video/bwindow/SDL_BView.h	Tue Feb 21 08:46:50 2006 +0000
   276.3 @@ -19,6 +19,7 @@
   276.4      Sam Lantinga
   276.5      slouken@libsdl.org
   276.6  */
   276.7 +#include "SDL_config.h"
   276.8  
   276.9  #ifndef _SDL_BView_h
  276.10  #define _SDL_BView_h
   277.1 --- a/src/video/bwindow/SDL_lowvideo.h	Tue Feb 21 08:34:45 2006 +0000
   277.2 +++ b/src/video/bwindow/SDL_lowvideo.h	Tue Feb 21 08:46:50 2006 +0000
   277.3 @@ -19,6 +19,7 @@
   277.4      Sam Lantinga
   277.5      slouken@libsdl.org
   277.6  */
   277.7 +#include "SDL_config.h"
   277.8  
   277.9  #ifndef _SDL_lowvideo_h
  277.10  #define _SDL_lowvideo_h
   278.1 --- a/src/video/bwindow/SDL_sysevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   278.2 +++ b/src/video/bwindow/SDL_sysevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   278.3 @@ -19,6 +19,7 @@
   278.4      Sam Lantinga
   278.5      slouken@libsdl.org
   278.6  */
   278.7 +#include "SDL_config.h"
   278.8  
   278.9  #include "SDL_lowvideo.h"
  278.10  
   279.1 --- a/src/video/bwindow/SDL_sysmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   279.2 +++ b/src/video/bwindow/SDL_sysmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   279.3 @@ -19,6 +19,7 @@
   279.4      Sam Lantinga
   279.5      slouken@libsdl.org
   279.6  */
   279.7 +#include "SDL_config.h"
   279.8  
   279.9  #include "SDL_lowvideo.h"
  279.10  
   280.1 --- a/src/video/bwindow/SDL_syswm_c.h	Tue Feb 21 08:34:45 2006 +0000
   280.2 +++ b/src/video/bwindow/SDL_syswm_c.h	Tue Feb 21 08:46:50 2006 +0000
   280.3 @@ -19,6 +19,7 @@
   280.4      Sam Lantinga
   280.5      slouken@libsdl.org
   280.6  */
   280.7 +#include "SDL_config.h"
   280.8  
   280.9  #include "SDL_syswm.h"
  280.10  #include "SDL_lowvideo.h"
   281.1 --- a/src/video/bwindow/SDL_sysyuv.h	Tue Feb 21 08:34:45 2006 +0000
   281.2 +++ b/src/video/bwindow/SDL_sysyuv.h	Tue Feb 21 08:46:50 2006 +0000
   281.3 @@ -19,6 +19,7 @@
   281.4      Sam Lantinga
   281.5      slouken@libsdl.org
   281.6  */
   281.7 +#include "SDL_config.h"
   281.8  
   281.9  
  281.10  #ifndef __SDL_SYS_YUV_H__
   282.1 --- a/src/video/cybergfx/SDL_amigaevents.c	Tue Feb 21 08:34:45 2006 +0000
   282.2 +++ b/src/video/cybergfx/SDL_amigaevents.c	Tue Feb 21 08:46:50 2006 +0000
   282.3 @@ -19,6 +19,7 @@
   282.4      Sam Lantinga
   282.5      slouken@libsdl.org
   282.6  */
   282.7 +#include "SDL_config.h"
   282.8  
   282.9  /* Handle the event stream, converting Amiga events into SDL events */
  282.10  #include "SDL.h"
   283.1 --- a/src/video/cybergfx/SDL_amigaevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   283.2 +++ b/src/video/cybergfx/SDL_amigaevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   283.3 @@ -19,6 +19,7 @@
   283.4      Sam Lantinga
   283.5      slouken@libsdl.org
   283.6  */
   283.7 +#include "SDL_config.h"
   283.8  
   283.9  #include "SDL_cgxvideo.h"
  283.10  
   284.1 --- a/src/video/cybergfx/SDL_amigamouse.c	Tue Feb 21 08:34:45 2006 +0000
   284.2 +++ b/src/video/cybergfx/SDL_amigamouse.c	Tue Feb 21 08:46:50 2006 +0000
   284.3 @@ -19,6 +19,7 @@
   284.4      Sam Lantinga
   284.5      slouken@libsdl.org
   284.6  */
   284.7 +#include "SDL_config.h"
   284.8  
   284.9  #include "SDL_mouse.h"
  284.10  #include "../../events/SDL_events_c.h"
   285.1 --- a/src/video/cybergfx/SDL_amigamouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   285.2 +++ b/src/video/cybergfx/SDL_amigamouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   285.3 @@ -19,6 +19,7 @@
   285.4      Sam Lantinga
   285.5      slouken@libsdl.org
   285.6  */
   285.7 +#include "SDL_config.h"
   285.8  
   285.9  #include "SDL_cgxvideo.h"
  285.10  
   286.1 --- a/src/video/cybergfx/SDL_cgxaccel.c	Tue Feb 21 08:34:45 2006 +0000
   286.2 +++ b/src/video/cybergfx/SDL_cgxaccel.c	Tue Feb 21 08:46:50 2006 +0000
   286.3 @@ -19,6 +19,7 @@
   286.4      Sam Lantinga
   286.5      slouken@libsdl.org
   286.6  */
   286.7 +#include "SDL_config.h"
   286.8  
   286.9  #include "SDL_endian.h"
  286.10  #include "SDL_video.h"
   287.1 --- a/src/video/cybergfx/SDL_cgxgl.c	Tue Feb 21 08:34:45 2006 +0000
   287.2 +++ b/src/video/cybergfx/SDL_cgxgl.c	Tue Feb 21 08:46:50 2006 +0000
   287.3 @@ -19,6 +19,7 @@
   287.4      Sam Lantinga
   287.5      slouken@libsdl.org
   287.6  */
   287.7 +#include "SDL_config.h"
   287.8  
   287.9  /* StormMesa implementation of SDL OpenGL support */
  287.10  
   288.1 --- a/src/video/cybergfx/SDL_cgxgl_c.h	Tue Feb 21 08:34:45 2006 +0000
   288.2 +++ b/src/video/cybergfx/SDL_cgxgl_c.h	Tue Feb 21 08:46:50 2006 +0000
   288.3 @@ -19,6 +19,7 @@
   288.4      Sam Lantinga
   288.5      slouken@libsdl.org
   288.6  */
   288.7 +#include "SDL_config.h"
   288.8  
   288.9  /* StormMesa implementation of SDL OpenGL support */
  288.10  
   289.1 --- a/src/video/cybergfx/SDL_cgximage.c	Tue Feb 21 08:34:45 2006 +0000
   289.2 +++ b/src/video/cybergfx/SDL_cgximage.c	Tue Feb 21 08:46:50 2006 +0000
   289.3 @@ -19,6 +19,7 @@
   289.4      Sam Lantinga
   289.5      slouken@libsdl.org
   289.6  */
   289.7 +#include "SDL_config.h"
   289.8  
   289.9  #include "SDL_endian.h"
  289.10  #include "SDL_cgximage_c.h"
   290.1 --- a/src/video/cybergfx/SDL_cgximage_c.h	Tue Feb 21 08:34:45 2006 +0000
   290.2 +++ b/src/video/cybergfx/SDL_cgximage_c.h	Tue Feb 21 08:46:50 2006 +0000
   290.3 @@ -19,6 +19,7 @@
   290.4      Sam Lantinga
   290.5      slouken@libsdl.org
   290.6  */
   290.7 +#include "SDL_config.h"
   290.8  
   290.9  #include "SDL_cgxvideo.h"
  290.10  
   291.1 --- a/src/video/cybergfx/SDL_cgxmodes.c	Tue Feb 21 08:34:45 2006 +0000
   291.2 +++ b/src/video/cybergfx/SDL_cgxmodes.c	Tue Feb 21 08:46:50 2006 +0000
   291.3 @@ -19,6 +19,7 @@
   291.4      Sam Lantinga
   291.5      slouken@libsdl.org
   291.6  */
   291.7 +#include "SDL_config.h"
   291.8  
   291.9  /* Utilities for getting and setting the X display mode */
  291.10  
   292.1 --- a/src/video/cybergfx/SDL_cgxmodes_c.h	Tue Feb 21 08:34:45 2006 +0000
   292.2 +++ b/src/video/cybergfx/SDL_cgxmodes_c.h	Tue Feb 21 08:46:50 2006 +0000
   292.3 @@ -19,6 +19,7 @@
   292.4      Sam Lantinga
   292.5      slouken@libsdl.org
   292.6  */
   292.7 +#include "SDL_config.h"
   292.8  
   292.9  /* Utilities for getting and setting the X display mode */
  292.10  
   293.1 --- a/src/video/cybergfx/SDL_cgxvideo.c	Tue Feb 21 08:34:45 2006 +0000
   293.2 +++ b/src/video/cybergfx/SDL_cgxvideo.c	Tue Feb 21 08:46:50 2006 +0000
   293.3 @@ -19,6 +19,7 @@
   293.4      Sam Lantinga
   293.5      slouken@libsdl.org
   293.6  */
   293.7 +#include "SDL_config.h"
   293.8  
   293.9  /*
  293.10   * CGX based SDL video driver implementation by Gabriele Greco
   294.1 --- a/src/video/cybergfx/SDL_cgxvideo.h	Tue Feb 21 08:34:45 2006 +0000
   294.2 +++ b/src/video/cybergfx/SDL_cgxvideo.h	Tue Feb 21 08:46:50 2006 +0000
   294.3 @@ -19,6 +19,7 @@
   294.4      Sam Lantinga
   294.5      slouken@libsdl.org
   294.6  */
   294.7 +#include "SDL_config.h"
   294.8  
   294.9  #ifndef _SDL_cgxvideo_h
  294.10  #define _SDL_cgxvideo_h
   295.1 --- a/src/video/cybergfx/SDL_cgxwm.c	Tue Feb 21 08:34:45 2006 +0000
   295.2 +++ b/src/video/cybergfx/SDL_cgxwm.c	Tue Feb 21 08:46:50 2006 +0000
   295.3 @@ -19,6 +19,7 @@
   295.4      Sam Lantinga
   295.5      slouken@libsdl.org
   295.6  */
   295.7 +#include "SDL_config.h"
   295.8  
   295.9  #include "SDL_version.h"
  295.10  #include "SDL_timer.h"
   296.1 --- a/src/video/cybergfx/SDL_cgxwm_c.h	Tue Feb 21 08:34:45 2006 +0000
   296.2 +++ b/src/video/cybergfx/SDL_cgxwm_c.h	Tue Feb 21 08:46:50 2006 +0000
   296.3 @@ -19,6 +19,7 @@
   296.4      Sam Lantinga
   296.5      slouken@libsdl.org
   296.6  */
   296.7 +#include "SDL_config.h"
   296.8  
   296.9  #include "SDL_cgxvideo.h"
  296.10  
   297.1 --- a/src/video/dc/SDL_dcevents.c	Tue Feb 21 08:34:45 2006 +0000
   297.2 +++ b/src/video/dc/SDL_dcevents.c	Tue Feb 21 08:46:50 2006 +0000
   297.3 @@ -19,6 +19,7 @@
   297.4      Sam Lantinga
   297.5      slouken@libsdl.org
   297.6  */
   297.7 +#include "SDL_config.h"
   297.8  
   297.9  #include "SDL.h"
  297.10  #include "../../events/SDL_sysevents.h"
   298.1 --- a/src/video/dc/SDL_dcevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   298.2 +++ b/src/video/dc/SDL_dcevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   298.3 @@ -19,6 +19,7 @@
   298.4      Sam Lantinga
   298.5      slouken@libsdl.org
   298.6  */
   298.7 +#include "SDL_config.h"
   298.8  
   298.9  #include "SDL_dcvideo.h"
  298.10  
   299.1 --- a/src/video/dc/SDL_dcmouse.c	Tue Feb 21 08:34:45 2006 +0000
   299.2 +++ b/src/video/dc/SDL_dcmouse.c	Tue Feb 21 08:46:50 2006 +0000
   299.3 @@ -19,6 +19,7 @@
   299.4      Sam Lantinga
   299.5      slouken@libsdl.org
   299.6  */
   299.7 +#include "SDL_config.h"
   299.8  
   299.9  #include <stdio.h>
  299.10  
   300.1 --- a/src/video/dc/SDL_dcmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   300.2 +++ b/src/video/dc/SDL_dcmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   300.3 @@ -19,6 +19,7 @@
   300.4      Sam Lantinga
   300.5      slouken@libsdl.org
   300.6  */
   300.7 +#include "SDL_config.h"
   300.8  
   300.9  #include "SDL_dcvideo.h"
  300.10  
   301.1 --- a/src/video/dc/SDL_dcvideo.c	Tue Feb 21 08:34:45 2006 +0000
   301.2 +++ b/src/video/dc/SDL_dcvideo.c	Tue Feb 21 08:46:50 2006 +0000
   301.3 @@ -19,6 +19,7 @@
   301.4      Sam Lantinga
   301.5      slouken@libsdl.org
   301.6  */
   301.7 +#include "SDL_config.h"
   301.8  
   301.9  #include "SDL_video.h"
  301.10  #include "SDL_mouse.h"
   302.1 --- a/src/video/dc/SDL_dcvideo.h	Tue Feb 21 08:34:45 2006 +0000
   302.2 +++ b/src/video/dc/SDL_dcvideo.h	Tue Feb 21 08:46:50 2006 +0000
   302.3 @@ -19,6 +19,7 @@
   302.4      Sam Lantinga
   302.5      slouken@libsdl.org
   302.6  */
   302.7 +#include "SDL_config.h"
   302.8  
   302.9  #ifndef _SDL_dcvideo_h
  302.10  #define _SDL_dcvideo_h
   303.1 --- a/src/video/dga/SDL_dgaevents.c	Tue Feb 21 08:34:45 2006 +0000
   303.2 +++ b/src/video/dga/SDL_dgaevents.c	Tue Feb 21 08:46:50 2006 +0000
   303.3 @@ -19,6 +19,7 @@
   303.4      Sam Lantinga
   303.5      slouken@libsdl.org
   303.6  */
   303.7 +#include "SDL_config.h"
   303.8  
   303.9  /* Handle the event stream, converting DGA events into SDL events */
  303.10  
   304.1 --- a/src/video/dga/SDL_dgaevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   304.2 +++ b/src/video/dga/SDL_dgaevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   304.3 @@ -19,6 +19,7 @@
   304.4      Sam Lantinga
   304.5      slouken@libsdl.org
   304.6  */
   304.7 +#include "SDL_config.h"
   304.8  
   304.9  #include "SDL_dgavideo.h"
  304.10  
   305.1 --- a/src/video/dga/SDL_dgamouse.c	Tue Feb 21 08:34:45 2006 +0000
   305.2 +++ b/src/video/dga/SDL_dgamouse.c	Tue Feb 21 08:46:50 2006 +0000
   305.3 @@ -19,6 +19,7 @@
   305.4      Sam Lantinga
   305.5      slouken@libsdl.org
   305.6  */
   305.7 +#include "SDL_config.h"
   305.8  
   305.9  #include <stdio.h>
  305.10  
   306.1 --- a/src/video/dga/SDL_dgamouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   306.2 +++ b/src/video/dga/SDL_dgamouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   306.3 @@ -19,6 +19,7 @@
   306.4      Sam Lantinga
   306.5      slouken@libsdl.org
   306.6  */
   306.7 +#include "SDL_config.h"
   306.8  
   306.9  #include "SDL_dgavideo.h"
  306.10  
   307.1 --- a/src/video/dga/SDL_dgavideo.c	Tue Feb 21 08:34:45 2006 +0000
   307.2 +++ b/src/video/dga/SDL_dgavideo.c	Tue Feb 21 08:46:50 2006 +0000
   307.3 @@ -19,6 +19,7 @@
   307.4      Sam Lantinga
   307.5      slouken@libsdl.org
   307.6  */
   307.7 +#include "SDL_config.h"
   307.8  
   307.9  /* DGA 2.0 based SDL video driver implementation.
  307.10  */
   308.1 --- a/src/video/dga/SDL_dgavideo.h	Tue Feb 21 08:34:45 2006 +0000
   308.2 +++ b/src/video/dga/SDL_dgavideo.h	Tue Feb 21 08:46:50 2006 +0000
   308.3 @@ -19,6 +19,7 @@
   308.4      Sam Lantinga
   308.5      slouken@libsdl.org
   308.6  */
   308.7 +#include "SDL_config.h"
   308.8  
   308.9  #ifndef _SDL_dgavideo_h
  308.10  #define _SDL_dgavideo_h
   309.1 --- a/src/video/directfb/SDL_DirectFB_events.c	Tue Feb 21 08:34:45 2006 +0000
   309.2 +++ b/src/video/directfb/SDL_DirectFB_events.c	Tue Feb 21 08:46:50 2006 +0000
   309.3 @@ -19,6 +19,7 @@
   309.4      Sam Lantinga
   309.5      slouken@libsdl.org
   309.6  */
   309.7 +#include "SDL_config.h"
   309.8  
   309.9  /* Handle the event stream, converting DirectFB input events into SDL events */
  309.10  
   310.1 --- a/src/video/directfb/SDL_DirectFB_events.h	Tue Feb 21 08:34:45 2006 +0000
   310.2 +++ b/src/video/directfb/SDL_DirectFB_events.h	Tue Feb 21 08:46:50 2006 +0000
   310.3 @@ -19,6 +19,7 @@
   310.4      Sam Lantinga
   310.5      slouken@libsdl.org
   310.6  */
   310.7 +#include "SDL_config.h"
   310.8  
   310.9  #include "SDL_DirectFB_video.h"
  310.10  
   311.1 --- a/src/video/directfb/SDL_DirectFB_video.c	Tue Feb 21 08:34:45 2006 +0000
   311.2 +++ b/src/video/directfb/SDL_DirectFB_video.c	Tue Feb 21 08:46:50 2006 +0000
   311.3 @@ -23,6 +23,7 @@
   311.4  	CRTC2 support is inspired by mplayer's dfbmga driver
   311.5  	written by Ville Syrj´┐Ż´┐Ż<syrjala@sci.fi>
   311.6  */
   311.7 +#include "SDL_config.h"
   311.8  
   311.9  /* DirectFB video driver implementation.
  311.10  */
   312.1 --- a/src/video/directfb/SDL_DirectFB_video.h	Tue Feb 21 08:34:45 2006 +0000
   312.2 +++ b/src/video/directfb/SDL_DirectFB_video.h	Tue Feb 21 08:46:50 2006 +0000
   312.3 @@ -19,6 +19,7 @@
   312.4      Sam Lantinga
   312.5      slouken@libsdl.org
   312.6  */
   312.7 +#include "SDL_config.h"
   312.8  
   312.9  #ifndef _SDL_DirectFB_video_h
  312.10  #define _SDL_DirectFB_video_h
   313.1 --- a/src/video/directfb/SDL_DirectFB_yuv.c	Tue Feb 21 08:34:45 2006 +0000
   313.2 +++ b/src/video/directfb/SDL_DirectFB_yuv.c	Tue Feb 21 08:46:50 2006 +0000
   313.3 @@ -19,6 +19,7 @@
   313.4      Sam Lantinga
   313.5      slouken@libsdl.org
   313.6  */
   313.7 +#include "SDL_config.h"
   313.8  
   313.9  /* This is the DirectFB implementation of YUV video overlays */
  313.10  
   314.1 --- a/src/video/directfb/SDL_DirectFB_yuv.h	Tue Feb 21 08:34:45 2006 +0000
   314.2 +++ b/src/video/directfb/SDL_DirectFB_yuv.h	Tue Feb 21 08:46:50 2006 +0000
   314.3 @@ -19,6 +19,7 @@
   314.4      Sam Lantinga
   314.5      slouken@libsdl.org
   314.6  */
   314.7 +#include "SDL_config.h"
   314.8  
   314.9  /* This is the DirectFB implementation of YUV video overlays */
  314.10  
   315.1 --- a/src/video/dummy/SDL_nullevents.c	Tue Feb 21 08:34:45 2006 +0000
   315.2 +++ b/src/video/dummy/SDL_nullevents.c	Tue Feb 21 08:46:50 2006 +0000
   315.3 @@ -19,6 +19,7 @@
   315.4      Sam Lantinga
   315.5      slouken@libsdl.org
   315.6  */
   315.7 +#include "SDL_config.h"
   315.8  
   315.9  /* Being a null driver, there's no event stream. We just define stubs for
  315.10     most of the API. */
   316.1 --- a/src/video/dummy/SDL_nullevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   316.2 +++ b/src/video/dummy/SDL_nullevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   316.3 @@ -19,6 +19,7 @@
   316.4      Sam Lantinga
   316.5      slouken@libsdl.org
   316.6  */
   316.7 +#include "SDL_config.h"
   316.8  
   316.9  #include "SDL_nullvideo.h"
  316.10  
   317.1 --- a/src/video/dummy/SDL_nullmouse.c	Tue Feb 21 08:34:45 2006 +0000
   317.2 +++ b/src/video/dummy/SDL_nullmouse.c	Tue Feb 21 08:46:50 2006 +0000
   317.3 @@ -19,6 +19,7 @@
   317.4      Sam Lantinga
   317.5      slouken@libsdl.org
   317.6  */
   317.7 +#include "SDL_config.h"
   317.8  
   317.9  #include "SDL_mouse.h"
  317.10  #include "../../events/SDL_events_c.h"
   318.1 --- a/src/video/dummy/SDL_nullmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   318.2 +++ b/src/video/dummy/SDL_nullmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   318.3 @@ -19,6 +19,7 @@
   318.4      Sam Lantinga
   318.5      slouken@libsdl.org
   318.6  */
   318.7 +#include "SDL_config.h"
   318.8  
   318.9  #include "SDL_nullvideo.h"
  318.10  
   319.1 --- a/src/video/dummy/SDL_nullvideo.c	Tue Feb 21 08:34:45 2006 +0000
   319.2 +++ b/src/video/dummy/SDL_nullvideo.c	Tue Feb 21 08:46:50 2006 +0000
   319.3 @@ -19,6 +19,7 @@
   319.4      Sam Lantinga
   319.5      slouken@libsdl.org
   319.6  */
   319.7 +#include "SDL_config.h"
   319.8  
   319.9  /* Dummy SDL video driver implementation; this is just enough to make an
  319.10   *  SDL-based application THINK it's got a working video driver, for
   320.1 --- a/src/video/dummy/SDL_nullvideo.h	Tue Feb 21 08:34:45 2006 +0000
   320.2 +++ b/src/video/dummy/SDL_nullvideo.h	Tue Feb 21 08:46:50 2006 +0000
   320.3 @@ -19,6 +19,7 @@
   320.4      Sam Lantinga
   320.5      slouken@libsdl.org
   320.6  */
   320.7 +#include "SDL_config.h"
   320.8  
   320.9  #ifndef _SDL_nullvideo_h
  320.10  #define _SDL_nullvideo_h
   321.1 --- a/src/video/epoc/SDL_epocevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   321.2 +++ b/src/video/epoc/SDL_epocevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   321.3 @@ -19,6 +19,7 @@
   321.4      Sam Lantinga
   321.5      slouken@libsdl.org
   321.6  */
   321.7 +#include "SDL_config.h"
   321.8  
   321.9  /*
  321.10      SDL_epocevents_c.h
   322.1 --- a/src/video/epoc/SDL_epocvideo.h	Tue Feb 21 08:34:45 2006 +0000
   322.2 +++ b/src/video/epoc/SDL_epocvideo.h	Tue Feb 21 08:46:50 2006 +0000
   322.3 @@ -19,6 +19,7 @@
   322.4      Sam Lantinga
   322.5      slouken@libsdl.org
   322.6  */
   322.7 +#include "SDL_config.h"
   322.8  
   322.9  /*
  322.10      SDL_epocvideo.h
   323.1 --- a/src/video/fbcon/3dfx_mmio.h	Tue Feb 21 08:34:45 2006 +0000
   323.2 +++ b/src/video/fbcon/3dfx_mmio.h	Tue Feb 21 08:46:50 2006 +0000
   323.3 @@ -19,6 +19,7 @@
   323.4      Sam Lantinga
   323.5      slouken@libsdl.org
   323.6  */
   323.7 +#include "SDL_config.h"
   323.8  
   323.9  /* 3Dfx register definitions */
  323.10  
   324.1 --- a/src/video/fbcon/3dfx_regs.h	Tue Feb 21 08:34:45 2006 +0000
   324.2 +++ b/src/video/fbcon/3dfx_regs.h	Tue Feb 21 08:46:50 2006 +0000
   324.3 @@ -19,6 +19,7 @@
   324.4      Sam Lantinga
   324.5      slouken@libsdl.org
   324.6  */
   324.7 +#include "SDL_config.h"
   324.8  
   324.9  #ifndef _3DFX_REGS_H
  324.10  #define _3DFX_REGS_H
   325.1 --- a/src/video/fbcon/SDL_fb3dfx.c	Tue Feb 21 08:34:45 2006 +0000
   325.2 +++ b/src/video/fbcon/SDL_fb3dfx.c	Tue Feb 21 08:46:50 2006 +0000
   325.3 @@ -19,6 +19,7 @@
   325.4      Sam Lantinga
   325.5      slouken@libsdl.org
   325.6  */
   325.7 +#include "SDL_config.h"
   325.8  
   325.9  #include "SDL_video.h"
  325.10  #include "../SDL_blit.h"
   326.1 --- a/src/video/fbcon/SDL_fb3dfx.h	Tue Feb 21 08:34:45 2006 +0000
   326.2 +++ b/src/video/fbcon/SDL_fb3dfx.h	Tue Feb 21 08:46:50 2006 +0000
   326.3 @@ -19,6 +19,7 @@
   326.4      Sam Lantinga
   326.5      slouken@libsdl.org
   326.6  */
   326.7 +#include "SDL_config.h"
   326.8  
   326.9  /* 3Dfx hardware acceleration for the SDL framebuffer console driver */
  326.10  
   327.1 --- a/src/video/fbcon/SDL_fbelo.c	Tue Feb 21 08:34:45 2006 +0000
   327.2 +++ b/src/video/fbcon/SDL_fbelo.c	Tue Feb 21 08:46:50 2006 +0000
   327.3 @@ -19,6 +19,7 @@
   327.4      Sam Lantinga
   327.5      slouken@libsdl.org
   327.6  */
   327.7 +#include "SDL_config.h"
   327.8  
   327.9  #include <unistd.h>
  327.10  #include <sys/time.h>
   328.1 --- a/src/video/fbcon/SDL_fbelo.h	Tue Feb 21 08:34:45 2006 +0000
   328.2 +++ b/src/video/fbcon/SDL_fbelo.h	Tue Feb 21 08:46:50 2006 +0000
   328.3 @@ -19,6 +19,7 @@
   328.4      Sam Lantinga
   328.5      slouken@libsdl.org
   328.6  */
   328.7 +#include "SDL_config.h"
   328.8  
   328.9  #ifndef SDL_fbelo_h
  328.10  #define SDL_fbelo_h
   329.1 --- a/src/video/fbcon/SDL_fbevents.c	Tue Feb 21 08:34:45 2006 +0000
   329.2 +++ b/src/video/fbcon/SDL_fbevents.c	Tue Feb 21 08:46:50 2006 +0000
   329.3 @@ -19,6 +19,7 @@
   329.4      Sam Lantinga
   329.5      slouken@libsdl.org
   329.6  */
   329.7 +#include "SDL_config.h"
   329.8  
   329.9  /* Handle the event stream, converting console events into SDL events */
  329.10  
   330.1 --- a/src/video/fbcon/SDL_fbevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   330.2 +++ b/src/video/fbcon/SDL_fbevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   330.3 @@ -19,6 +19,7 @@
   330.4      Sam Lantinga
   330.5      slouken@libsdl.org
   330.6  */
   330.7 +#include "SDL_config.h"
   330.8  
   330.9  #include "SDL_fbvideo.h"
  330.10  
   331.1 --- a/src/video/fbcon/SDL_fbmatrox.c	Tue Feb 21 08:34:45 2006 +0000
   331.2 +++ b/src/video/fbcon/SDL_fbmatrox.c	Tue Feb 21 08:46:50 2006 +0000
   331.3 @@ -19,6 +19,7 @@
   331.4      Sam Lantinga
   331.5      slouken@libsdl.org
   331.6  */
   331.7 +#include "SDL_config.h"
   331.8  
   331.9  #include "SDL_video.h"
  331.10  #include "../SDL_blit.h"
   332.1 --- a/src/video/fbcon/SDL_fbmatrox.h	Tue Feb 21 08:34:45 2006 +0000
   332.2 +++ b/src/video/fbcon/SDL_fbmatrox.h	Tue Feb 21 08:46:50 2006 +0000
   332.3 @@ -19,6 +19,7 @@
   332.4      Sam Lantinga
   332.5      slouken@libsdl.org
   332.6  */
   332.7 +#include "SDL_config.h"
   332.8  
   332.9  /* Matrox hardware acceleration for the SDL framebuffer console driver */
  332.10  
   333.1 --- a/src/video/fbcon/SDL_fbmouse.c	Tue Feb 21 08:34:45 2006 +0000
   333.2 +++ b/src/video/fbcon/SDL_fbmouse.c	Tue Feb 21 08:46:50 2006 +0000
   333.3 @@ -19,6 +19,7 @@
   333.4      Sam Lantinga
   333.5      slouken@libsdl.org
   333.6  */
   333.7 +#include "SDL_config.h"
   333.8  
   333.9  #include "SDL_mouse.h"
  333.10  #include "../../events/SDL_events_c.h"
   334.1 --- a/src/video/fbcon/SDL_fbmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   334.2 +++ b/src/video/fbcon/SDL_fbmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   334.3 @@ -19,6 +19,7 @@
   334.4      Sam Lantinga
   334.5      slouken@libsdl.org
   334.6  */
   334.7 +#include "SDL_config.h"
   334.8  
   334.9  #include "SDL_fbvideo.h"
  334.10  
   335.1 --- a/src/video/fbcon/SDL_fbriva.c	Tue Feb 21 08:34:45 2006 +0000
   335.2 +++ b/src/video/fbcon/SDL_fbriva.c	Tue Feb 21 08:46:50 2006 +0000
   335.3 @@ -19,6 +19,7 @@
   335.4      Sam Lantinga
   335.5      slouken@libsdl.org
   335.6  */
   335.7 +#include "SDL_config.h"
   335.8  
   335.9  #include "SDL_video.h"
  335.10  #include "../SDL_blit.h"
   336.1 --- a/src/video/fbcon/SDL_fbriva.h	Tue Feb 21 08:34:45 2006 +0000
   336.2 +++ b/src/video/fbcon/SDL_fbriva.h	Tue Feb 21 08:46:50 2006 +0000
   336.3 @@ -19,6 +19,7 @@
   336.4      Sam Lantinga
   336.5      slouken@libsdl.org
   336.6  */
   336.7 +#include "SDL_config.h"
   336.8  
   336.9  /* Riva hardware acceleration for the SDL framebuffer console driver */
  336.10  
   337.1 --- a/src/video/fbcon/SDL_fbvideo.c	Tue Feb 21 08:34:45 2006 +0000
   337.2 +++ b/src/video/fbcon/SDL_fbvideo.c	Tue Feb 21 08:46:50 2006 +0000
   337.3 @@ -19,6 +19,7 @@
   337.4      Sam Lantinga
   337.5      slouken@libsdl.org
   337.6  */
   337.7 +#include "SDL_config.h"
   337.8  
   337.9  /* Framebuffer console based SDL video driver implementation.
  337.10  */
   338.1 --- a/src/video/fbcon/SDL_fbvideo.h	Tue Feb 21 08:34:45 2006 +0000
   338.2 +++ b/src/video/fbcon/SDL_fbvideo.h	Tue Feb 21 08:46:50 2006 +0000
   338.3 @@ -19,6 +19,7 @@
   338.4      Sam Lantinga
   338.5      slouken@libsdl.org
   338.6  */
   338.7 +#include "SDL_config.h"
   338.8  
   338.9  #ifndef _SDL_fbvideo_h
  338.10  #define _SDL_fbvideo_h
   339.1 --- a/src/video/fbcon/matrox_mmio.h	Tue Feb 21 08:34:45 2006 +0000
   339.2 +++ b/src/video/fbcon/matrox_mmio.h	Tue Feb 21 08:46:50 2006 +0000
   339.3 @@ -19,6 +19,7 @@
   339.4      Sam Lantinga
   339.5      slouken@libsdl.org
   339.6  */
   339.7 +#include "SDL_config.h"
   339.8  
   339.9  /* MGA register definitions */
  339.10  
   340.1 --- a/src/video/fbcon/riva_regs.h	Tue Feb 21 08:34:45 2006 +0000
   340.2 +++ b/src/video/fbcon/riva_regs.h	Tue Feb 21 08:46:50 2006 +0000
   340.3 @@ -19,6 +19,7 @@
   340.4      Sam Lantinga
   340.5      slouken@libsdl.org
   340.6  */
   340.7 +#include "SDL_config.h"
   340.8  
   340.9  #ifndef _RIVA_REGS_H
  340.10  #define _RIVA_REGS_H
   341.1 --- a/src/video/gapi/SDL_gapivideo.c	Tue Feb 21 08:34:45 2006 +0000
   341.2 +++ b/src/video/gapi/SDL_gapivideo.c	Tue Feb 21 08:46:50 2006 +0000
   341.3 @@ -19,6 +19,7 @@
   341.4      Sam Lantinga
   341.5      slouken@libsdl.org
   341.6  */
   341.7 +#include "SDL_config.h"
   341.8  
   341.9  /* Pocket PC GAPI SDL video driver implementation;
  341.10  Implemented by Dmitry Yakimov - support@activekitten.com
   342.1 --- a/src/video/gapi/SDL_gapivideo.h	Tue Feb 21 08:34:45 2006 +0000
   342.2 +++ b/src/video/gapi/SDL_gapivideo.h	Tue Feb 21 08:46:50 2006 +0000
   342.3 @@ -19,6 +19,7 @@
   342.4      Sam Lantinga
   342.5      slouken@libsdl.org
   342.6  */
   342.7 +#include "SDL_config.h"
   342.8  
   342.9  #ifndef _SDL_gapivideo_h
  342.10  #define _SDL_gapivideo_h
   343.1 --- a/src/video/gem/SDL_gemevents.c	Tue Feb 21 08:34:45 2006 +0000
   343.2 +++ b/src/video/gem/SDL_gemevents.c	Tue Feb 21 08:46:50 2006 +0000
   343.3 @@ -19,6 +19,7 @@
   343.4      Sam Lantinga
   343.5      slouken@libsdl.org
   343.6  */
   343.7 +#include "SDL_config.h"
   343.8  
   343.9  /*
  343.10   * GEM SDL video driver implementation
   344.1 --- a/src/video/gem/SDL_gemevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   344.2 +++ b/src/video/gem/SDL_gemevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   344.3 @@ -19,6 +19,7 @@
   344.4      Sam Lantinga
   344.5      slouken@libsdl.org
   344.6  */
   344.7 +#include "SDL_config.h"
   344.8  
   344.9  #include "SDL_gemvideo.h"
  344.10  
   345.1 --- a/src/video/gem/SDL_gemmouse.c	Tue Feb 21 08:34:45 2006 +0000
   345.2 +++ b/src/video/gem/SDL_gemmouse.c	Tue Feb 21 08:46:50 2006 +0000
   345.3 @@ -19,6 +19,7 @@
   345.4      Sam Lantinga
   345.5      slouken@libsdl.org
   345.6  */
   345.7 +#include "SDL_config.h"
   345.8  
   345.9  /*
  345.10   *	GEM Mouse manager
   346.1 --- a/src/video/gem/SDL_gemmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   346.2 +++ b/src/video/gem/SDL_gemmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   346.3 @@ -19,6 +19,7 @@
   346.4      Sam Lantinga
   346.5      slouken@libsdl.org
   346.6  */
   346.7 +#include "SDL_config.h"
   346.8  
   346.9  #include "SDL_gemvideo.h"
  346.10  
   347.1 --- a/src/video/gem/SDL_gemvideo.c	Tue Feb 21 08:34:45 2006 +0000
   347.2 +++ b/src/video/gem/SDL_gemvideo.c	Tue Feb 21 08:46:50 2006 +0000
   347.3 @@ -19,6 +19,7 @@
   347.4      Sam Lantinga
   347.5      slouken@libsdl.org
   347.6  */
   347.7 +#include "SDL_config.h"
   347.8  
   347.9  /*
  347.10  	GEM video driver
   348.1 --- a/src/video/gem/SDL_gemvideo.h	Tue Feb 21 08:34:45 2006 +0000
   348.2 +++ b/src/video/gem/SDL_gemvideo.h	Tue Feb 21 08:46:50 2006 +0000
   348.3 @@ -19,6 +19,7 @@
   348.4      Sam Lantinga
   348.5      slouken@libsdl.org
   348.6  */
   348.7 +#include "SDL_config.h"
   348.8  
   348.9  #ifndef _SDL_gemvideo_h
  348.10  #define _SDL_gemvideo_h
   349.1 --- a/src/video/gem/SDL_gemwm.c	Tue Feb 21 08:34:45 2006 +0000
   349.2 +++ b/src/video/gem/SDL_gemwm.c	Tue Feb 21 08:46:50 2006 +0000
   349.3 @@ -19,6 +19,7 @@
   349.4      Sam Lantinga
   349.5      slouken@libsdl.org
   349.6  */
   349.7 +#include "SDL_config.h"
   349.8  
   349.9  /*
  349.10  	GEM SDL video driver
   350.1 --- a/src/video/gem/SDL_gemwm_c.h	Tue Feb 21 08:34:45 2006 +0000
   350.2 +++ b/src/video/gem/SDL_gemwm_c.h	Tue Feb 21 08:46:50 2006 +0000
   350.3 @@ -19,6 +19,7 @@
   350.4      Sam Lantinga
   350.5      slouken@libsdl.org
   350.6  */
   350.7 +#include "SDL_config.h"
   350.8  
   350.9  /*
  350.10   *	GEM SDL video driver implementation
   351.1 --- a/src/video/ggi/SDL_ggievents.c	Tue Feb 21 08:34:45 2006 +0000
   351.2 +++ b/src/video/ggi/SDL_ggievents.c	Tue Feb 21 08:46:50 2006 +0000
   351.3 @@ -19,6 +19,7 @@
   351.4      Sam Lantinga
   351.5      slouken@libsdl.org
   351.6  */
   351.7 +#include "SDL_config.h"
   351.8  
   351.9  /* Handle the event stream, converting GGI events into SDL events */
  351.10  
   352.1 --- a/src/video/ggi/SDL_ggievents_c.h	Tue Feb 21 08:34:45 2006 +0000
   352.2 +++ b/src/video/ggi/SDL_ggievents_c.h	Tue Feb 21 08:46:50 2006 +0000
   352.3 @@ -19,6 +19,7 @@
   352.4      Sam Lantinga
   352.5      slouken@libsdl.org
   352.6  */
   352.7 +#include "SDL_config.h"
   352.8  
   352.9  #include "SDL_ggivideo.h"
  352.10  
   353.1 --- a/src/video/ggi/SDL_ggimouse.c	Tue Feb 21 08:34:45 2006 +0000
   353.2 +++ b/src/video/ggi/SDL_ggimouse.c	Tue Feb 21 08:46:50 2006 +0000
   353.3 @@ -19,6 +19,7 @@
   353.4      Sam Lantinga
   353.5      slouken@libsdl.org
   353.6  */
   353.7 +#include "SDL_config.h"
   353.8  
   353.9  #include "SDL_mouse.h"
  353.10  #include "../../events/SDL_events_c.h"
   354.1 --- a/src/video/ggi/SDL_ggimouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   354.2 +++ b/src/video/ggi/SDL_ggimouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   354.3 @@ -19,6 +19,7 @@
   354.4      Sam Lantinga
   354.5      slouken@libsdl.org
   354.6  */
   354.7 +#include "SDL_config.h"
   354.8  
   354.9  #include "SDL_ggivideo.h"
  354.10  
   355.1 --- a/src/video/ggi/SDL_ggivideo.c	Tue Feb 21 08:34:45 2006 +0000
   355.2 +++ b/src/video/ggi/SDL_ggivideo.c	Tue Feb 21 08:46:50 2006 +0000
   355.3 @@ -19,6 +19,7 @@
   355.4      Sam Lantinga
   355.5      slouken@libsdl.org
   355.6  */
   355.7 +#include "SDL_config.h"
   355.8  
   355.9  /* GGI-based SDL video driver implementation.
  355.10  */
   356.1 --- a/src/video/ggi/SDL_ggivideo.h	Tue Feb 21 08:34:45 2006 +0000
   356.2 +++ b/src/video/ggi/SDL_ggivideo.h	Tue Feb 21 08:46:50 2006 +0000
   356.3 @@ -19,6 +19,7 @@
   356.4      Sam Lantinga
   356.5      slouken@libsdl.org
   356.6  */
   356.7 +#include "SDL_config.h"
   356.8  
   356.9  #ifndef _SDL_ggivideo_h
  356.10  #define _SDL_ggivideo_h
   357.1 --- a/src/video/ipod/SDL_ipodvideo.c	Tue Feb 21 08:34:45 2006 +0000
   357.2 +++ b/src/video/ipod/SDL_ipodvideo.c	Tue Feb 21 08:46:50 2006 +0000
   357.3 @@ -1,3 +1,26 @@
   357.4 +/*
   357.5 +    SDL - Simple DirectMedia Layer
   357.6 +    Copyright (C) 1997-2006 Sam Lantinga
   357.7 +
   357.8 +    This library is free software; you can redistribute it and/or
   357.9 +    modify it under the terms of the GNU Lesser General Public
  357.10 +    License as published by the Free Software Foundation; either
  357.11 +    version 2.1 of the License, or (at your option) any later version.
  357.12 +
  357.13 +    This library is distributed in the hope that it will be useful,
  357.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  357.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  357.16 +    Lesser General Public License for more details.
  357.17 +
  357.18 +    You should have received a copy of the GNU Lesser General Public
  357.19 +    License along with this library; if not, write to the Free Software
  357.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  357.21 +
  357.22 +    Sam Lantinga
  357.23 +    slouken@libsdl.org
  357.24 +*/
  357.25 +#include "SDL_config.h"
  357.26 +
  357.27  #include <sys/types.h>
  357.28  #include <sys/ioctl.h>
  357.29  
   358.1 --- a/src/video/ipod/SDL_ipodvideo.h	Tue Feb 21 08:34:45 2006 +0000
   358.2 +++ b/src/video/ipod/SDL_ipodvideo.h	Tue Feb 21 08:46:50 2006 +0000
   358.3 @@ -19,6 +19,7 @@
   358.4      Sam Lantinga
   358.5      slouken@libsdl.org
   358.6  */
   358.7 +#include "SDL_config.h"
   358.8  
   358.9  /* iPod SDL framebuffer driver
  358.10   * Joshua Oreman
   359.1 --- a/src/video/maccommon/SDL_lowvideo.h	Tue Feb 21 08:34:45 2006 +0000
   359.2 +++ b/src/video/maccommon/SDL_lowvideo.h	Tue Feb 21 08:46:50 2006 +0000
   359.3 @@ -19,6 +19,7 @@
   359.4      Sam Lantinga
   359.5      slouken@libsdl.org
   359.6  */
   359.7 +#include "SDL_config.h"
   359.8  
   359.9  #ifndef _SDL_lowvideo_h
  359.10  #define _SDL_lowvideo_h
  359.11 @@ -35,14 +36,8 @@
  359.12  #endif
  359.13  
  359.14  #if SDL_VIDEO_OPENGL
  359.15 -#ifdef MACOSX
  359.16 -#include <OpenGL/gl.h> /* OpenGL.framework */
  359.17 -#include <AGL/agl.h>   /* AGL.framework */
  359.18 -#else
  359.19 -#include <GL/gl.h>
  359.20 -#include <agl.h>
  359.21 -#endif /* MACOSX */
  359.22 -#endif /* SDL_VIDEO_OPENGL */
  359.23 +#include "SDL_opengl.h"
  359.24 +#endif
  359.25  
  359.26  #include "SDL_video.h"
  359.27  #include "../SDL_sysvideo.h"
   360.1 --- a/src/video/maccommon/SDL_macevents.c	Tue Feb 21 08:34:45 2006 +0000
   360.2 +++ b/src/video/maccommon/SDL_macevents.c	Tue Feb 21 08:46:50 2006 +0000
   360.3 @@ -19,6 +19,7 @@
   360.4      Sam Lantinga
   360.5      slouken@libsdl.org
   360.6  */
   360.7 +#include "SDL_config.h"
   360.8  
   360.9  #include <stdio.h>
  360.10  
   361.1 --- a/src/video/maccommon/SDL_macevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   361.2 +++ b/src/video/maccommon/SDL_macevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   361.3 @@ -19,6 +19,7 @@
   361.4      Sam Lantinga
   361.5      slouken@libsdl.org
   361.6  */
   361.7 +#include "SDL_config.h"
   361.8  
   361.9  #include "SDL_romvideo.h"
  361.10  
   362.1 --- a/src/video/maccommon/SDL_macgl.c	Tue Feb 21 08:34:45 2006 +0000
   362.2 +++ b/src/video/maccommon/SDL_macgl.c	Tue Feb 21 08:46:50 2006 +0000
   362.3 @@ -19,6 +19,7 @@
   362.4      Sam Lantinga
   362.5      slouken@libsdl.org
   362.6  */
   362.7 +#include "SDL_config.h"
   362.8  
   362.9  /* AGL implementation of SDL OpenGL support */
  362.10  
   363.1 --- a/src/video/maccommon/SDL_macgl_c.h	Tue Feb 21 08:34:45 2006 +0000
   363.2 +++ b/src/video/maccommon/SDL_macgl_c.h	Tue Feb 21 08:46:50 2006 +0000
   363.3 @@ -22,15 +22,11 @@
   363.4  
   363.5  /* AGL implementation of SDL OpenGL support */
   363.6  
   363.7 +#include "SDL_config.h"
   363.8 +
   363.9  #if SDL_VIDEO_OPENGL
  363.10 -#ifdef MACOSX
  363.11 -#include <OpenGL/gl.h> /* OpenGL.framework */
  363.12 -#include <AGL/agl.h>   /* AGL.framework */
  363.13 -#else
  363.14 -#include <GL/gl.h>
  363.15 -#include <agl.h>
  363.16 -#endif /* MACOSX */
  363.17 -#endif /* SDL_VIDEO_OPENGL */
  363.18 +#include "SDL_opengl.h"
  363.19 +#endif
  363.20  
  363.21  /* OpenGL functions */
  363.22  extern int Mac_GL_Init(_THIS);
   364.1 --- a/src/video/maccommon/SDL_macmouse.c	Tue Feb 21 08:34:45 2006 +0000
   364.2 +++ b/src/video/maccommon/SDL_macmouse.c	Tue Feb 21 08:46:50 2006 +0000
   364.3 @@ -19,6 +19,7 @@
   364.4      Sam Lantinga
   364.5      slouken@libsdl.org
   364.6  */
   364.7 +#include "SDL_config.h"
   364.8  
   364.9  #if defined(__APPLE__) && defined(__MACH__)
  364.10  #include <Carbon/Carbon.h>
   365.1 --- a/src/video/maccommon/SDL_macmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   365.2 +++ b/src/video/maccommon/SDL_macmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   365.3 @@ -19,6 +19,7 @@
   365.4      Sam Lantinga
   365.5      slouken@libsdl.org
   365.6  */
   365.7 +#include "SDL_config.h"
   365.8  
   365.9  #include "SDL_romvideo.h"
  365.10  
   366.1 --- a/src/video/maccommon/SDL_macwm.c	Tue Feb 21 08:34:45 2006 +0000
   366.2 +++ b/src/video/maccommon/SDL_macwm.c	Tue Feb 21 08:46:50 2006 +0000
   366.3 @@ -19,6 +19,7 @@
   366.4      Sam Lantinga
   366.5      slouken@libsdl.org
   366.6  */
   366.7 +#include "SDL_config.h"
   366.8  
   366.9  #if defined(__APPLE__) && defined(__MACH__)
  366.10  #include <Carbon/Carbon.h>
   367.1 --- a/src/video/maccommon/SDL_macwm_c.h	Tue Feb 21 08:34:45 2006 +0000
   367.2 +++ b/src/video/maccommon/SDL_macwm_c.h	Tue Feb 21 08:46:50 2006 +0000
   367.3 @@ -19,6 +19,7 @@
   367.4      Sam Lantinga
   367.5      slouken@libsdl.org
   367.6  */
   367.7 +#include "SDL_config.h"
   367.8  
   367.9  #include "SDL_romvideo.h"
  367.10  
   368.1 --- a/src/video/macdsp/SDL_dspvideo.c	Tue Feb 21 08:34:45 2006 +0000
   368.2 +++ b/src/video/macdsp/SDL_dspvideo.c	Tue Feb 21 08:46:50 2006 +0000
   368.3 @@ -19,6 +19,7 @@
   368.4      Sam Lantinga
   368.5      slouken@libsdl.org
   368.6  */
   368.7 +#include "SDL_config.h"
   368.8  
   368.9  /*
  368.10   Written by Darrell Walisser <dwaliss1@purdue.edu>
   369.1 --- a/src/video/macdsp/SDL_dspvideo.h	Tue Feb 21 08:34:45 2006 +0000
   369.2 +++ b/src/video/macdsp/SDL_dspvideo.h	Tue Feb 21 08:46:50 2006 +0000
   369.3 @@ -19,6 +19,7 @@
   369.4      Sam Lantinga
   369.5      slouken@libsdl.org
   369.6  */
   369.7 +#include "SDL_config.h"
   369.8  
   369.9  #ifndef _SDL_dspvideo_h
  369.10  #define _SDL_dspvideo_h
   370.1 --- a/src/video/macrom/SDL_romvideo.c	Tue Feb 21 08:34:45 2006 +0000
   370.2 +++ b/src/video/macrom/SDL_romvideo.c	Tue Feb 21 08:46:50 2006 +0000
   370.3 @@ -19,6 +19,7 @@
   370.4      Sam Lantinga
   370.5      slouken@libsdl.org
   370.6  */
   370.7 +#include "SDL_config.h"
   370.8  
   370.9  #if defined(__APPLE__) && defined(__MACH__)
  370.10  #include <Carbon/Carbon.h>
  370.11 @@ -498,7 +499,7 @@
  370.12  		(SDL_modelist[0]->w-width)/2, (SDL_modelist[0]->h-height)/2);
  370.13  	}
  370.14  
  370.15 -#if MACOSX && !USE_QUICKTIME
  370.16 +#if defined(__MACOSX__) && !USE_QUICKTIME
  370.17  	/* Hum.. fullscreen mode is broken */
  370.18  	flags &= ~SDL_FULLSCREEN;
  370.19  #endif
   371.1 --- a/src/video/macrom/SDL_romvideo.h	Tue Feb 21 08:34:45 2006 +0000
   371.2 +++ b/src/video/macrom/SDL_romvideo.h	Tue Feb 21 08:46:50 2006 +0000
   371.3 @@ -19,6 +19,7 @@
   371.4      Sam Lantinga
   371.5      slouken@libsdl.org
   371.6  */
   371.7 +#include "SDL_config.h"
   371.8  
   371.9  #ifndef _SDL_romvideo_h
  371.10  #define _SDL_romvideo_h
   372.1 --- a/src/video/nanox/SDL_nxevents.c	Tue Feb 21 08:34:45 2006 +0000
   372.2 +++ b/src/video/nanox/SDL_nxevents.c	Tue Feb 21 08:46:50 2006 +0000
   372.3 @@ -24,6 +24,7 @@
   372.4      Hsieh-Fu Tsai
   372.5      clare@setabox.com
   372.6  */
   372.7 +#include "SDL_config.h"
   372.8  
   372.9  #include "SDL_keysym.h"
  372.10  #include "../../events/SDL_events_c.h"
   373.1 --- a/src/video/nanox/SDL_nxevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   373.2 +++ b/src/video/nanox/SDL_nxevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   373.3 @@ -23,6 +23,7 @@
   373.4      Hsieh-Fu Tsai
   373.5      clare@setabox.com
   373.6  */
   373.7 +#include "SDL_config.h"
   373.8  
   373.9  #include "SDL_nxvideo.h"
  373.10  
   374.1 --- a/src/video/nanox/SDL_nximage.c	Tue Feb 21 08:34:45 2006 +0000
   374.2 +++ b/src/video/nanox/SDL_nximage.c	Tue Feb 21 08:46:50 2006 +0000
   374.3 @@ -24,6 +24,7 @@
   374.4      Hsieh-Fu Tsai
   374.5      clare@setabox.com
   374.6  */
   374.7 +#include "SDL_config.h"
   374.8  
   374.9  #include "SDL_nximage_c.h"
  374.10  
   375.1 --- a/src/video/nanox/SDL_nximage_c.h	Tue Feb 21 08:34:45 2006 +0000
   375.2 +++ b/src/video/nanox/SDL_nximage_c.h	Tue Feb 21 08:46:50 2006 +0000
   375.3 @@ -23,6 +23,7 @@
   375.4      Hsieh-Fu Tsai
   375.5      clare@setabox.com
   375.6  */
   375.7 +#include "SDL_config.h"
   375.8  
   375.9  #include "SDL_nxvideo.h"
  375.10  
   376.1 --- a/src/video/nanox/SDL_nxmodes.c	Tue Feb 21 08:34:45 2006 +0000
   376.2 +++ b/src/video/nanox/SDL_nxmodes.c	Tue Feb 21 08:46:50 2006 +0000
   376.3 @@ -23,6 +23,7 @@
   376.4      Hsieh-Fu Tsai
   376.5      clare@setabox.com
   376.6  */
   376.7 +#include "SDL_config.h"
   376.8  
   376.9  #include "SDL_stdinc.h"
  376.10  #include "SDL_nxmodes_c.h"
   377.1 --- a/src/video/nanox/SDL_nxmodes_c.h	Tue Feb 21 08:34:45 2006 +0000
   377.2 +++ b/src/video/nanox/SDL_nxmodes_c.h	Tue Feb 21 08:46:50 2006 +0000
   377.3 @@ -23,6 +23,7 @@
   377.4      Hsieh-Fu Tsai
   377.5      clare@setabox.com
   377.6  */
   377.7 +#include "SDL_config.h"
   377.8  
   377.9  #include "SDL_nxvideo.h"
  377.10  #include <SDL.h>
   378.1 --- a/src/video/nanox/SDL_nxmouse.c	Tue Feb 21 08:34:45 2006 +0000
   378.2 +++ b/src/video/nanox/SDL_nxmouse.c	Tue Feb 21 08:46:50 2006 +0000
   378.3 @@ -23,6 +23,7 @@
   378.4      Hsieh-Fu Tsai
   378.5      clare@setabox.com
   378.6  */
   378.7 +#include "SDL_config.h"
   378.8  
   378.9  #include "../../events/SDL_events_c.h"
  378.10  
   379.1 --- a/src/video/nanox/SDL_nxmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   379.2 +++ b/src/video/nanox/SDL_nxmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   379.3 @@ -1,3 +1,26 @@
   379.4 +/*
   379.5 +    SDL - Simple DirectMedia Layer
   379.6 +    Copyright (C) 1997-2006 Sam Lantinga
   379.7 +
   379.8 +    This library is free software; you can redistribute it and/or
   379.9 +    modify it under the terms of the GNU Lesser General Public
  379.10 +    License as published by the Free Software Foundation; either
  379.11 +    version 2.1 of the License, or (at your option) any later version.
  379.12 +
  379.13 +    This library is distributed in the hope that it will be useful,
  379.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  379.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  379.16 +    Lesser General Public License for more details.
  379.17 +
  379.18 +    You should have received a copy of the GNU Lesser General Public
  379.19 +    License along with this library; if not, write to the Free Software
  379.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  379.21 +
  379.22 +    Sam Lantinga
  379.23 +    slouken@libsdl.org
  379.24 +*/
  379.25 +#include "SDL_config.h"
  379.26 +
  379.27  #include "SDL_nxvideo.h"
  379.28  
  379.29  extern WMcursor * NX_CreateWMCursor (_THIS, Uint8 * data, Uint8 * mask, int w, int h, int hot_x, int hot_y) ;
   380.1 --- a/src/video/nanox/SDL_nxvideo.c	Tue Feb 21 08:34:45 2006 +0000
   380.2 +++ b/src/video/nanox/SDL_nxvideo.c	Tue Feb 21 08:46:50 2006 +0000
   380.3 @@ -24,6 +24,7 @@
   380.4      Hsieh-Fu Tsai
   380.5      clare@setabox.com
   380.6  */
   380.7 +#include "SDL_config.h"
   380.8  
   380.9  #include "SDL_thread.h"
  380.10  #include "SDL_video.h"
   381.1 --- a/src/video/nanox/SDL_nxvideo.h	Tue Feb 21 08:34:45 2006 +0000
   381.2 +++ b/src/video/nanox/SDL_nxvideo.h	Tue Feb 21 08:46:50 2006 +0000
   381.3 @@ -23,6 +23,7 @@
   381.4      Hsieh-Fu Tsai
   381.5      clare@setabox.com
   381.6  */
   381.7 +#include "SDL_config.h"
   381.8  
   381.9  #ifndef _SDL_nxvideo_h
  381.10  #define _SDL_nxvideo_h
   382.1 --- a/src/video/nanox/SDL_nxwm.c	Tue Feb 21 08:34:45 2006 +0000
   382.2 +++ b/src/video/nanox/SDL_nxwm.c	Tue Feb 21 08:46:50 2006 +0000
   382.3 @@ -23,6 +23,7 @@
   382.4      Hsieh-Fu Tsai
   382.5      clare@setabox.com
   382.6  */
   382.7 +#include "SDL_config.h"
   382.8  
   382.9  #include "SDL_syswm.h"
  382.10  #include "../../events/SDL_events_c.h"
   383.1 --- a/src/video/nanox/SDL_nxwm_c.h	Tue Feb 21 08:34:45 2006 +0000
   383.2 +++ b/src/video/nanox/SDL_nxwm_c.h	Tue Feb 21 08:46:50 2006 +0000
   383.3 @@ -23,6 +23,7 @@
   383.4      Hsieh-Fu Tsai
   383.5      clare@setabox.com
   383.6  */
   383.7 +#include "SDL_config.h"
   383.8  
   383.9  #include "SDL_nxvideo.h"
  383.10  
   384.1 --- a/src/video/os2fslib/SDL_os2fslib.c	Tue Feb 21 08:34:45 2006 +0000
   384.2 +++ b/src/video/os2fslib/SDL_os2fslib.c	Tue Feb 21 08:46:50 2006 +0000
   384.3 @@ -19,6 +19,7 @@
   384.4      Sam Lantinga
   384.5      slouken@libsdl.org
   384.6  */
   384.7 +#include "SDL_config.h"
   384.8  
   384.9  #include <process.h>
  384.10  #include <time.h>
   385.1 --- a/src/video/os2fslib/SDL_os2fslib.h	Tue Feb 21 08:34:45 2006 +0000
   385.2 +++ b/src/video/os2fslib/SDL_os2fslib.h	Tue Feb 21 08:46:50 2006 +0000
   385.3 @@ -19,6 +19,7 @@
   385.4      Sam Lantinga
   385.5      slouken@libsdl.org
   385.6  */
   385.7 +#include "SDL_config.h"
   385.8  
   385.9  #ifndef _SDL_os2fslib_h
  385.10  #define _SDL_os2fslib_h
   386.1 --- a/src/video/photon/SDL_ph_events.c	Tue Feb 21 08:34:45 2006 +0000
   386.2 +++ b/src/video/photon/SDL_ph_events.c	Tue Feb 21 08:46:50 2006 +0000
   386.3 @@ -19,6 +19,7 @@
   386.4      Sam Lantinga
   386.5      slouken@libsdl.org
   386.6  */
   386.7 +#include "SDL_config.h"
   386.8  
   386.9  /* Handle the event stream, converting photon events into SDL events */
  386.10  
   387.1 --- a/src/video/photon/SDL_ph_events_c.h	Tue Feb 21 08:34:45 2006 +0000
   387.2 +++ b/src/video/photon/SDL_ph_events_c.h	Tue Feb 21 08:46:50 2006 +0000
   387.3 @@ -19,6 +19,7 @@
   387.4      Sam Lantinga
   387.5      slouken@libsdl.org
   387.6  */
   387.7 +#include "SDL_config.h"
   387.8  
   387.9  #ifndef __SDL_PH_EVENTS_H__
  387.10  #define __SDL_PH_EVENTS_H__
   388.1 --- a/src/video/photon/SDL_ph_gl.c	Tue Feb 21 08:34:45 2006 +0000
   388.2 +++ b/src/video/photon/SDL_ph_gl.c	Tue Feb 21 08:46:50 2006 +0000
   388.3 @@ -19,6 +19,7 @@
   388.4      Sam Lantinga
   388.5      slouken@libsdl.org
   388.6  */
   388.7 +#include "SDL_config.h"
   388.8  
   388.9  #include <dlfcn.h>
  388.10  #include "SDL.h"
   389.1 --- a/src/video/photon/SDL_ph_gl.h	Tue Feb 21 08:34:45 2006 +0000
   389.2 +++ b/src/video/photon/SDL_ph_gl.h	Tue Feb 21 08:46:50 2006 +0000
   389.3 @@ -19,6 +19,7 @@
   389.4      Sam Lantinga
   389.5      slouken@libsdl.org
   389.6  */
   389.7 +#include "SDL_config.h"
   389.8  
   389.9  #ifndef __SDL_PH_GL_H__
  389.10  #define __SDL_PH_GL_H__
   390.1 --- a/src/video/photon/SDL_ph_image.c	Tue Feb 21 08:34:45 2006 +0000
   390.2 +++ b/src/video/photon/SDL_ph_image.c	Tue Feb 21 08:46:50 2006 +0000
   390.3 @@ -19,6 +19,7 @@
   390.4      Sam Lantinga
   390.5      slouken@libsdl.org
   390.6  */
   390.7 +#include "SDL_config.h"
   390.8  
   390.9  #include <Ph.h>
  390.10  #include <photon/Pg.h>
   391.1 --- a/src/video/photon/SDL_ph_image_c.h	Tue Feb 21 08:34:45 2006 +0000
   391.2 +++ b/src/video/photon/SDL_ph_image_c.h	Tue Feb 21 08:46:50 2006 +0000
   391.3 @@ -19,6 +19,7 @@
   391.4      Sam Lantinga
   391.5      slouken@libsdl.org
   391.6  */
   391.7 +#include "SDL_config.h"
   391.8  
   391.9  #ifndef __SDL_PH_IMAGE_H__
  391.10  #define __SDL_PH_IMAGE_H__
   392.1 --- a/src/video/photon/SDL_ph_modes.c	Tue Feb 21 08:34:45 2006 +0000
   392.2 +++ b/src/video/photon/SDL_ph_modes.c	Tue Feb 21 08:46:50 2006 +0000
   392.3 @@ -19,6 +19,7 @@
   392.4      Sam Lantinga
   392.5      slouken@libsdl.org
   392.6  */
   392.7 +#include "SDL_config.h"
   392.8  
   392.9  #include "SDL_ph_modes_c.h"
  392.10  
   393.1 --- a/src/video/photon/SDL_ph_modes_c.h	Tue Feb 21 08:34:45 2006 +0000
   393.2 +++ b/src/video/photon/SDL_ph_modes_c.h	Tue Feb 21 08:46:50 2006 +0000
   393.3 @@ -19,6 +19,7 @@
   393.4      Sam Lantinga
   393.5      slouken@libsdl.org
   393.6  */
   393.7 +#include "SDL_config.h"
   393.8  
   393.9  #ifndef __SDL_PH_MODES_H__
  393.10  #define __SDL_PH_MODES_H__
   394.1 --- a/src/video/photon/SDL_ph_mouse.c	Tue Feb 21 08:34:45 2006 +0000
   394.2 +++ b/src/video/photon/SDL_ph_mouse.c	Tue Feb 21 08:46:50 2006 +0000
   394.3 @@ -19,6 +19,7 @@
   394.4      Sam Lantinga
   394.5      slouken@libsdl.org
   394.6  */
   394.7 +#include "SDL_config.h"
   394.8  
   394.9  #include "SDL_mouse.h"
  394.10  #include "../../events/SDL_events_c.h"
   395.1 --- a/src/video/photon/SDL_ph_mouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   395.2 +++ b/src/video/photon/SDL_ph_mouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   395.3 @@ -19,6 +19,7 @@
   395.4      Sam Lantinga
   395.5      slouken@libsdl.org
   395.6  */
   395.7 +#include "SDL_config.h"
   395.8  
   395.9  #ifndef __SDL_PH_MOUSE_H__
  395.10  #define __SDL_PH_MOUSE_H__
   396.1 --- a/src/video/photon/SDL_ph_video.c	Tue Feb 21 08:34:45 2006 +0000
   396.2 +++ b/src/video/photon/SDL_ph_video.c	Tue Feb 21 08:46:50 2006 +0000
   396.3 @@ -19,6 +19,7 @@
   396.4      Sam Lantinga
   396.5      slouken@libsdl.org
   396.6  */
   396.7 +#include "SDL_config.h"
   396.8  
   396.9  #include <unistd.h>
  396.10  #include <sys/ioctl.h>
   397.1 --- a/src/video/photon/SDL_ph_video.h	Tue Feb 21 08:34:45 2006 +0000
   397.2 +++ b/src/video/photon/SDL_ph_video.h	Tue Feb 21 08:46:50 2006 +0000
   397.3 @@ -19,6 +19,7 @@
   397.4      Sam Lantinga
   397.5      slouken@libsdl.org
   397.6  */
   397.7 +#include "SDL_config.h"
   397.8  
   397.9  #ifndef __SDL_PH_VIDEO_H__
  397.10  #define __SDL_PH_VIDEO_H__
   398.1 --- a/src/video/photon/SDL_ph_wm.c	Tue Feb 21 08:34:45 2006 +0000
   398.2 +++ b/src/video/photon/SDL_ph_wm.c	Tue Feb 21 08:46:50 2006 +0000
   398.3 @@ -19,6 +19,7 @@
   398.4      Sam Lantinga
   398.5      slouken@libsdl.org
   398.6  */
   398.7 +#include "SDL_config.h"
   398.8  
   398.9  #include <Ph.h>
  398.10  #include <photon/PpProto.h>
   399.1 --- a/src/video/photon/SDL_ph_wm_c.h	Tue Feb 21 08:34:45 2006 +0000
   399.2 +++ b/src/video/photon/SDL_ph_wm_c.h	Tue Feb 21 08:46:50 2006 +0000
   399.3 @@ -19,6 +19,7 @@
   399.4      Sam Lantinga
   399.5      slouken@libsdl.org
   399.6  */
   399.7 +#include "SDL_config.h"
   399.8  
   399.9  #ifndef __SDL_PH_WM_H__
  399.10  #define __SDL_PH_WM_H__
   400.1 --- a/src/video/photon/SDL_phyuv.c	Tue Feb 21 08:34:45 2006 +0000
   400.2 +++ b/src/video/photon/SDL_phyuv.c	Tue Feb 21 08:46:50 2006 +0000
   400.3 @@ -19,6 +19,7 @@
   400.4      Sam Lantinga
   400.5      slouken@libsdl.org
   400.6  */
   400.7 +#include "SDL_config.h"
   400.8  
   400.9  /* This is the QNX Realtime Platform version of SDL YUV video overlays */
  400.10  
   401.1 --- a/src/video/photon/SDL_phyuv_c.h	Tue Feb 21 08:34:45 2006 +0000
   401.2 +++ b/src/video/photon/SDL_phyuv_c.h	Tue Feb 21 08:46:50 2006 +0000
   401.3 @@ -19,7 +19,7 @@
   401.4      Sam Lantinga
   401.5      slouken@libsdl.org
   401.6  */
   401.7 -
   401.8 +#include "SDL_config.h"
   401.9  
  401.10  #ifndef __SDL_PH_YUV_H__
  401.11  #define __SDL_PH_YUV_H__
   402.1 --- a/src/video/picogui/SDL_pgevents.c	Tue Feb 21 08:34:45 2006 +0000
   402.2 +++ b/src/video/picogui/SDL_pgevents.c	Tue Feb 21 08:46:50 2006 +0000
   402.3 @@ -22,6 +22,7 @@
   402.4      Micah Dowty
   402.5      micahjd@users.sourceforge.net
   402.6  */
   402.7 +#include "SDL_config.h"
   402.8  
   402.9  #include "SDL.h"
  402.10  #include "../../events/SDL_sysevents.h"
   403.1 --- a/src/video/picogui/SDL_pgevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   403.2 +++ b/src/video/picogui/SDL_pgevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   403.3 @@ -22,6 +22,7 @@
   403.4      Micah Dowty
   403.5      micahjd@users.sourceforge.net
   403.6  */
   403.7 +#include "SDL_config.h"
   403.8  
   403.9  #include "SDL_pgvideo.h"
  403.10  
   404.1 --- a/src/video/picogui/SDL_pgvideo.c	Tue Feb 21 08:34:45 2006 +0000
   404.2 +++ b/src/video/picogui/SDL_pgvideo.c	Tue Feb 21 08:46:50 2006 +0000
   404.3 @@ -22,6 +22,7 @@
   404.4      Micah Dowty
   404.5      micahjd@users.sourceforge.net
   404.6  */
   404.7 +#include "SDL_config.h"
   404.8  
   404.9  #include "SDL_video.h"
  404.10  #include "SDL_mouse.h"
   405.1 --- a/src/video/picogui/SDL_pgvideo.h	Tue Feb 21 08:34:45 2006 +0000
   405.2 +++ b/src/video/picogui/SDL_pgvideo.h	Tue Feb 21 08:46:50 2006 +0000
   405.3 @@ -22,6 +22,7 @@
   405.4      Micah Dowty
   405.5      micahjd@users.sourceforge.net
   405.6  */
   405.7 +#include "SDL_config.h"
   405.8  
   405.9  #ifndef _SDL_pgvideo_h
  405.10  #define _SDL_pgvideo_h
   406.1 --- a/src/video/ps2gs/SDL_gsevents.c	Tue Feb 21 08:34:45 2006 +0000
   406.2 +++ b/src/video/ps2gs/SDL_gsevents.c	Tue Feb 21 08:46:50 2006 +0000
   406.3 @@ -19,6 +19,7 @@
   406.4      Sam Lantinga
   406.5      slouken@libsdl.org
   406.6  */
   406.7 +#include "SDL_config.h"
   406.8  
   406.9  /* Handle the event stream, converting console events into SDL events */
  406.10  
   407.1 --- a/src/video/ps2gs/SDL_gsevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   407.2 +++ b/src/video/ps2gs/SDL_gsevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   407.3 @@ -19,6 +19,7 @@
   407.4      Sam Lantinga
   407.5      slouken@libsdl.org
   407.6  */
   407.7 +#include "SDL_config.h"
   407.8  
   407.9  #include "SDL_gsvideo.h"
  407.10  
   408.1 --- a/src/video/ps2gs/SDL_gsmouse.c	Tue Feb 21 08:34:45 2006 +0000
   408.2 +++ b/src/video/ps2gs/SDL_gsmouse.c	Tue Feb 21 08:46:50 2006 +0000
   408.3 @@ -19,6 +19,7 @@
   408.4      Sam Lantinga
   408.5      slouken@libsdl.org
   408.6  */
   408.7 +#include "SDL_config.h"
   408.8  
   408.9  #include <sys/ioctl.h>
  408.10  
   409.1 --- a/src/video/ps2gs/SDL_gsmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   409.2 +++ b/src/video/ps2gs/SDL_gsmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   409.3 @@ -19,6 +19,7 @@
   409.4      Sam Lantinga
   409.5      slouken@libsdl.org
   409.6  */
   409.7 +#include "SDL_config.h"
   409.8  
   409.9  #include "SDL_gsvideo.h"
  409.10  
   410.1 --- a/src/video/ps2gs/SDL_gsvideo.c	Tue Feb 21 08:34:45 2006 +0000
   410.2 +++ b/src/video/ps2gs/SDL_gsvideo.c	Tue Feb 21 08:46:50 2006 +0000
   410.3 @@ -19,6 +19,7 @@
   410.4      Sam Lantinga
   410.5      slouken@libsdl.org
   410.6  */
   410.7 +#include "SDL_config.h"
   410.8  
   410.9  /* Framebuffer console based SDL video driver implementation.
  410.10  */
   411.1 --- a/src/video/ps2gs/SDL_gsvideo.h	Tue Feb 21 08:34:45 2006 +0000
   411.2 +++ b/src/video/ps2gs/SDL_gsvideo.h	Tue Feb 21 08:46:50 2006 +0000
   411.3 @@ -19,6 +19,7 @@
   411.4      Sam Lantinga
   411.5      slouken@libsdl.org
   411.6  */
   411.7 +#include "SDL_config.h"
   411.8  
   411.9  #ifndef _SDL_gsvideo_h
  411.10  #define _SDL_gsvideo_h
   412.1 --- a/src/video/ps2gs/SDL_gsyuv.c	Tue Feb 21 08:34:45 2006 +0000
   412.2 +++ b/src/video/ps2gs/SDL_gsyuv.c	Tue Feb 21 08:46:50 2006 +0000
   412.3 @@ -19,6 +19,7 @@
   412.4      Sam Lantinga
   412.5      slouken@libsdl.org
   412.6  */
   412.7 +#include "SDL_config.h"
   412.8  
   412.9  /* This is the Playstation 2 implementation of YUV video overlays */
  412.10  
   413.1 --- a/src/video/ps2gs/SDL_gsyuv_c.h	Tue Feb 21 08:34:45 2006 +0000
   413.2 +++ b/src/video/ps2gs/SDL_gsyuv_c.h	Tue Feb 21 08:46:50 2006 +0000
   413.3 @@ -19,6 +19,7 @@
   413.4      Sam Lantinga
   413.5      slouken@libsdl.org
   413.6  */
   413.7 +#include "SDL_config.h"
   413.8  
   413.9  /* This is the Playstation 2 implementation of YUV video overlays */
  413.10  
   414.1 --- a/src/video/qtopia/SDL_QPEApp.h	Tue Feb 21 08:34:45 2006 +0000
   414.2 +++ b/src/video/qtopia/SDL_QPEApp.h	Tue Feb 21 08:46:50 2006 +0000
   414.3 @@ -19,6 +19,7 @@
   414.4      Sam Lantinga
   414.5      slouken@libsdl.org
   414.6  */
   414.7 +#include "SDL_config.h"
   414.8  
   414.9  /* Handle the QPE application loop */
  414.10  
   415.1 --- a/src/video/qtopia/SDL_QWin.h	Tue Feb 21 08:34:45 2006 +0000
   415.2 +++ b/src/video/qtopia/SDL_QWin.h	Tue Feb 21 08:46:50 2006 +0000
   415.3 @@ -19,6 +19,7 @@
   415.4      Sam Lantinga
   415.5      slouken@libsdl.org
   415.6  */
   415.7 +#include "SDL_config.h"
   415.8  
   415.9  #ifndef _SDL_QWin_h
  415.10  #define _SDL_QWin_h
   416.1 --- a/src/video/qtopia/SDL_lowvideo.h	Tue Feb 21 08:34:45 2006 +0000
   416.2 +++ b/src/video/qtopia/SDL_lowvideo.h	Tue Feb 21 08:46:50 2006 +0000
   416.3 @@ -19,6 +19,7 @@
   416.4      Sam Lantinga
   416.5      slouken@libsdl.org
   416.6  */
   416.7 +#include "SDL_config.h"
   416.8  
   416.9  #ifndef _SDL_lowvideo_h
  416.10  #define _SDL_lowvideo_h
   417.1 --- a/src/video/qtopia/SDL_sysevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   417.2 +++ b/src/video/qtopia/SDL_sysevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   417.3 @@ -19,6 +19,7 @@
   417.4      Sam Lantinga
   417.5      slouken@libsdl.org
   417.6  */
   417.7 +#include "SDL_config.h"
   417.8  
   417.9  #include "SDL_lowvideo.h"
  417.10  
   418.1 --- a/src/video/qtopia/SDL_sysmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   418.2 +++ b/src/video/qtopia/SDL_sysmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   418.3 @@ -19,6 +19,7 @@
   418.4      Sam Lantinga
   418.5      slouken@libsdl.org
   418.6  */
   418.7 +#include "SDL_config.h"
   418.8  
   418.9  #include "SDL_lowvideo.h"
  418.10  
   419.1 --- a/src/video/qtopia/SDL_syswm_c.h	Tue Feb 21 08:34:45 2006 +0000
   419.2 +++ b/src/video/qtopia/SDL_syswm_c.h	Tue Feb 21 08:46:50 2006 +0000
   419.3 @@ -19,6 +19,7 @@
   419.4      Sam Lantinga
   419.5      slouken@libsdl.org
   419.6  */
   419.7 +#include "SDL_config.h"
   419.8  
   419.9  #include "SDL_lowvideo.h"
  419.10  
   420.1 --- a/src/video/quartz/CGS.h	Tue Feb 21 08:34:45 2006 +0000
   420.2 +++ b/src/video/quartz/CGS.h	Tue Feb 21 08:46:50 2006 +0000
   420.3 @@ -19,6 +19,7 @@
   420.4      Sam Lantinga
   420.5      slouken@libsdl.org
   420.6  */
   420.7 +#include "SDL_config.h"
   420.8  
   420.9  /* 
  420.10      Obscuring code: maximum number of windows above ours (inclusive) 
   421.1 --- a/src/video/quartz/SDL_QuartzKeys.h	Tue Feb 21 08:34:45 2006 +0000
   421.2 +++ b/src/video/quartz/SDL_QuartzKeys.h	Tue Feb 21 08:46:50 2006 +0000
   421.3 @@ -19,6 +19,7 @@
   421.4      Sam Lantinga
   421.5      slouken@libsdl.org
   421.6  */
   421.7 +#include "SDL_config.h"
   421.8  
   421.9  /* These are the Macintosh key scancode constants -- from Inside Macintosh */
  421.10  
   422.1 --- a/src/video/quartz/SDL_QuartzVideo.h	Tue Feb 21 08:34:45 2006 +0000
   422.2 +++ b/src/video/quartz/SDL_QuartzVideo.h	Tue Feb 21 08:46:50 2006 +0000
   422.3 @@ -19,6 +19,7 @@
   422.4      Sam Lantinga
   422.5      slouken@libsdl.org
   422.6  */
   422.7 +#include "SDL_config.h"
   422.8  
   422.9  /*    
  422.10      @file   SDL_QuartzVideo.h
   423.1 --- a/src/video/quartz/SDL_QuartzWindow.h	Tue Feb 21 08:34:45 2006 +0000
   423.2 +++ b/src/video/quartz/SDL_QuartzWindow.h	Tue Feb 21 08:46:50 2006 +0000
   423.3 @@ -19,6 +19,7 @@
   423.4      Sam Lantinga
   423.5      slouken@libsdl.org
   423.6  */
   423.7 +#include "SDL_config.h"
   423.8  
   423.9  /* Subclass of NSWindow to fix genie effect and support resize events  */
  423.10  @interface SDL_QuartzWindow : NSWindow
   424.1 --- a/src/video/riscos/SDL_riscosFullScreenVideo.c	Tue Feb 21 08:34:45 2006 +0000
   424.2 +++ b/src/video/riscos/SDL_riscosFullScreenVideo.c	Tue Feb 21 08:46:50 2006 +0000
   424.3 @@ -19,6 +19,7 @@
   424.4      Sam Lantinga
   424.5      slouken@libsdl.org
   424.6  */
   424.7 +#include "SDL_config.h"
   424.8  
   424.9  /*
  424.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   425.1 --- a/src/video/riscos/SDL_riscosevents.c	Tue Feb 21 08:34:45 2006 +0000
   425.2 +++ b/src/video/riscos/SDL_riscosevents.c	Tue Feb 21 08:46:50 2006 +0000
   425.3 @@ -19,6 +19,7 @@
   425.4      Sam Lantinga
   425.5      slouken@libsdl.org
   425.6  */
   425.7 +#include "SDL_config.h"
   425.8  
   425.9  /*
  425.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   426.1 --- a/src/video/riscos/SDL_riscosevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   426.2 +++ b/src/video/riscos/SDL_riscosevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   426.3 @@ -19,6 +19,7 @@
   426.4      Sam Lantinga
   426.5      slouken@libsdl.org
   426.6  */
   426.7 +#include "SDL_config.h"
   426.8  
   426.9  #include "SDL_riscosvideo.h"
  426.10  
   427.1 --- a/src/video/riscos/SDL_riscosmouse.c	Tue Feb 21 08:34:45 2006 +0000
   427.2 +++ b/src/video/riscos/SDL_riscosmouse.c	Tue Feb 21 08:46:50 2006 +0000
   427.3 @@ -19,6 +19,7 @@
   427.4      Sam Lantinga
   427.5      slouken@libsdl.org
   427.6  */
   427.7 +#include "SDL_config.h"
   427.8  
   427.9  /*
  427.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   428.1 --- a/src/video/riscos/SDL_riscosmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   428.2 +++ b/src/video/riscos/SDL_riscosmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   428.3 @@ -19,6 +19,7 @@
   428.4      Sam Lantinga
   428.5      slouken@libsdl.org
   428.6  */
   428.7 +#include "SDL_config.h"
   428.8  
   428.9  #include "SDL_riscosvideo.h"
  428.10  
   429.1 --- a/src/video/riscos/SDL_riscossprite.c	Tue Feb 21 08:34:45 2006 +0000
   429.2 +++ b/src/video/riscos/SDL_riscossprite.c	Tue Feb 21 08:46:50 2006 +0000
   429.3 @@ -19,6 +19,7 @@
   429.4      Sam Lantinga
   429.5      slouken@libsdl.org
   429.6  */
   429.7 +#include "SDL_config.h"
   429.8  
   429.9  /*
  429.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   430.1 --- a/src/video/riscos/SDL_riscostask.c	Tue Feb 21 08:34:45 2006 +0000
   430.2 +++ b/src/video/riscos/SDL_riscostask.c	Tue Feb 21 08:46:50 2006 +0000
   430.3 @@ -19,6 +19,7 @@
   430.4      Sam Lantinga
   430.5      slouken@libsdl.org
   430.6  */
   430.7 +#include "SDL_config.h"
   430.8  
   430.9  /*
  430.10      This file added by Alan Buckley (alan_baa@hotmail.com) to support RISC OS 
   431.1 --- a/src/video/riscos/SDL_riscostask.h	Tue Feb 21 08:34:45 2006 +0000
   431.2 +++ b/src/video/riscos/SDL_riscostask.h	Tue Feb 21 08:46:50 2006 +0000
   431.3 @@ -19,6 +19,7 @@
   431.4      Sam Lantinga
   431.5      slouken@libsdl.org
   431.6  */
   431.7 +#include "SDL_config.h"
   431.8  
   431.9  /*
  431.10      This file added by Alan Buckley (alan_baa@hotmail.com) to support RISC OS 
   432.1 --- a/src/video/riscos/SDL_riscosvideo.c	Tue Feb 21 08:34:45 2006 +0000
   432.2 +++ b/src/video/riscos/SDL_riscosvideo.c	Tue Feb 21 08:46:50 2006 +0000
   432.3 @@ -19,6 +19,7 @@
   432.4      Sam Lantinga
   432.5      slouken@libsdl.org
   432.6  */
   432.7 +#include "SDL_config.h"
   432.8  
   432.9  /*
  432.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   433.1 --- a/src/video/riscos/SDL_riscosvideo.h	Tue Feb 21 08:34:45 2006 +0000
   433.2 +++ b/src/video/riscos/SDL_riscosvideo.h	Tue Feb 21 08:46:50 2006 +0000
   433.3 @@ -19,6 +19,7 @@
   433.4      Sam Lantinga
   433.5      slouken@libsdl.org
   433.6  */
   433.7 +#include "SDL_config.h"
   433.8  
   433.9  #ifndef _SDL_riscosvideo_h
  433.10  #define _SDL_riscosvideo_h
   434.1 --- a/src/video/riscos/SDL_wimppoll.c	Tue Feb 21 08:34:45 2006 +0000
   434.2 +++ b/src/video/riscos/SDL_wimppoll.c	Tue Feb 21 08:46:50 2006 +0000
   434.3 @@ -19,6 +19,7 @@
   434.4      Sam Lantinga
   434.5      slouken@libsdl.org
   434.6  */
   434.7 +#include "SDL_config.h"
   434.8  
   434.9  /*
  434.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   435.1 --- a/src/video/riscos/SDL_wimpvideo.c	Tue Feb 21 08:34:45 2006 +0000
   435.2 +++ b/src/video/riscos/SDL_wimpvideo.c	Tue Feb 21 08:46:50 2006 +0000
   435.3 @@ -19,6 +19,7 @@
   435.4      Sam Lantinga
   435.5      slouken@libsdl.org
   435.6  */
   435.7 +#include "SDL_config.h"
   435.8  
   435.9  /*
  435.10       File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
   436.1 --- a/src/video/svga/SDL_svgaevents.c	Tue Feb 21 08:34:45 2006 +0000
   436.2 +++ b/src/video/svga/SDL_svgaevents.c	Tue Feb 21 08:46:50 2006 +0000
   436.3 @@ -19,16 +19,17 @@
   436.4      Sam Lantinga
   436.5      slouken@libsdl.org
   436.6  */
   436.7 +#include "SDL_config.h"
   436.8  
   436.9  /* Handle the event stream, converting X11 events into SDL events */
  436.10  
  436.11  #include <vga.h>
  436.12  #include <vgamouse.h>
  436.13  #include <vgakeyboard.h>
  436.14 -#if defined(linux)
  436.15 +#if defined(__LINUX__)
  436.16  #include <linux/kd.h>
  436.17  #include <linux/keyboard.h>
  436.18 -#elif defined(__FreeBSD__)
  436.19 +#elif defined(__FREEBSD__)
  436.20  #include <sys/kbio.h>
  436.21  #else
  436.22  #error You must choose your operating system here
  436.23 @@ -43,7 +44,7 @@
  436.24  #if defined(linux)
  436.25  #define NUM_VGAKEYMAPS	(1<<KG_CAPSSHIFT)
  436.26  static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS];
  436.27 -#elif defined(__FreeBSD__)
  436.28 +#elif defined(__FREEBSD__)
  436.29  /* FIXME: Free the keymap when we shut down the video mode */
  436.30  static keymap_t *vga_keymap = NULL;
  436.31  #else
  436.32 @@ -126,7 +127,7 @@
  436.33  	}
  436.34  	return(0);
  436.35  }
  436.36 -#elif defined(__FreeBSD__)
  436.37 +#elif defined(__FREEBSD__)
  436.38  int SVGA_initkeymaps(int fd)
  436.39  {
  436.40  	vga_keymap = SDL_malloc(sizeof(keymap_t));
  436.41 @@ -374,7 +375,7 @@
  436.42  	}
  436.43  	return(keysym);
  436.44  }
  436.45 -#elif defined(__FreeBSD__)
  436.46 +#elif defined(__FREEBSD__)
  436.47  static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
  436.48  {
  436.49  	/* Set the keysym information */
   437.1 --- a/src/video/svga/SDL_svgaevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   437.2 +++ b/src/video/svga/SDL_svgaevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   437.3 @@ -19,6 +19,7 @@
   437.4      Sam Lantinga
   437.5      slouken@libsdl.org
   437.6  */
   437.7 +#include "SDL_config.h"
   437.8  
   437.9  #include "SDL_svgavideo.h"
  437.10  
   438.1 --- a/src/video/svga/SDL_svgamouse.c	Tue Feb 21 08:34:45 2006 +0000
   438.2 +++ b/src/video/svga/SDL_svgamouse.c	Tue Feb 21 08:46:50 2006 +0000
   438.3 @@ -19,6 +19,7 @@
   438.4      Sam Lantinga
   438.5      slouken@libsdl.org
   438.6  */
   438.7 +#include "SDL_config.h"
   438.8  
   438.9  #include "SDL_mouse.h"
  438.10  #include "../../events/SDL_events_c.h"
   439.1 --- a/src/video/svga/SDL_svgamouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   439.2 +++ b/src/video/svga/SDL_svgamouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   439.3 @@ -19,6 +19,7 @@
   439.4      Sam Lantinga
   439.5      slouken@libsdl.org
   439.6  */
   439.7 +#include "SDL_config.h"
   439.8  
   439.9  #include "SDL_svgavideo.h"
  439.10  
   440.1 --- a/src/video/svga/SDL_svgavideo.c	Tue Feb 21 08:34:45 2006 +0000
   440.2 +++ b/src/video/svga/SDL_svgavideo.c	Tue Feb 21 08:46:50 2006 +0000
   440.3 @@ -19,6 +19,7 @@
   440.4      Sam Lantinga
   440.5      slouken@libsdl.org
   440.6  */
   440.7 +#include "SDL_config.h"
   440.8  
   440.9  /* SVGAlib based SDL video driver implementation.
  440.10  */
  440.11 @@ -29,9 +30,9 @@
  440.12  #include <sys/ioctl.h>
  440.13  #include <fcntl.h>
  440.14  
  440.15 -#if defined(linux)
  440.16 +#if defined(__LINUX__)
  440.17  #include <linux/vt.h>
  440.18 -#elif defined(__FreeBSD__)
  440.19 +#elif defined(__FREEBSD__)
  440.20  #include <sys/consio.h>
  440.21  #else
  440.22  #error You must choose your operating system here
   441.1 --- a/src/video/svga/SDL_svgavideo.h	Tue Feb 21 08:34:45 2006 +0000
   441.2 +++ b/src/video/svga/SDL_svgavideo.h	Tue Feb 21 08:46:50 2006 +0000
   441.3 @@ -19,6 +19,7 @@
   441.4      Sam Lantinga
   441.5      slouken@libsdl.org
   441.6  */
   441.7 +#include "SDL_config.h"
   441.8  
   441.9  #ifndef _SDL_svgavideo_h
  441.10  #define _SDL_svgavideo_h
   442.1 --- a/src/video/vgl/SDL_vglevents.c	Tue Feb 21 08:34:45 2006 +0000
   442.2 +++ b/src/video/vgl/SDL_vglevents.c	Tue Feb 21 08:46:50 2006 +0000
   442.3 @@ -19,6 +19,7 @@
   442.4      Sam Lantinga
   442.5      slouken@libsdl.org
   442.6  */
   442.7 +#include "SDL_config.h"
   442.8  
   442.9  /* Handle the event stream, converting X11 events into SDL events */
  442.10  
   443.1 --- a/src/video/vgl/SDL_vglevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   443.2 +++ b/src/video/vgl/SDL_vglevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   443.3 @@ -19,6 +19,7 @@
   443.4      Sam Lantinga
   443.5      slouken@libsdl.org
   443.6  */
   443.7 +#include "SDL_config.h"
   443.8  
   443.9  #include "SDL_vglvideo.h"
  443.10  
   444.1 --- a/src/video/vgl/SDL_vglmouse.c	Tue Feb 21 08:34:45 2006 +0000
   444.2 +++ b/src/video/vgl/SDL_vglmouse.c	Tue Feb 21 08:46:50 2006 +0000
   444.3 @@ -19,6 +19,7 @@
   444.4      Sam Lantinga
   444.5      slouken@libsdl.org
   444.6  */
   444.7 +#include "SDL_config.h"
   444.8  
   444.9  #include "SDL_mouse.h"
  444.10  #include "../../events/SDL_events_c.h"
   445.1 --- a/src/video/vgl/SDL_vglmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   445.2 +++ b/src/video/vgl/SDL_vglmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   445.3 @@ -19,6 +19,7 @@
   445.4      Sam Lantinga
   445.5      slouken@libsdl.org
   445.6  */
   445.7 +#include "SDL_config.h"
   445.8  
   445.9  #include "SDL_vglvideo.h"
  445.10  
   446.1 --- a/src/video/vgl/SDL_vglvideo.c	Tue Feb 21 08:34:45 2006 +0000
   446.2 +++ b/src/video/vgl/SDL_vglvideo.c	Tue Feb 21 08:46:50 2006 +0000
   446.3 @@ -19,6 +19,7 @@
   446.4      Sam Lantinga
   446.5      slouken@libsdl.org
   446.6  */
   446.7 +#include "SDL_config.h"
   446.8  
   446.9  /* libvga based SDL video driver implementation.
  446.10  */
  446.11 @@ -548,7 +549,7 @@
  446.12      case V_INFO_MM_VGAX:
  446.13        vminfop->Type = VIDBUF8X;
  446.14        break;
  446.15 -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000
  446.16 +#if defined(__FREEBSD__) && __FreeBSD_version >= 500000
  446.17      case V_INFO_MM_DIRECT:
  446.18        vminfop->PixelBytes = minfo.vi_pixel_size;
  446.19        switch (vminfop->PixelBytes) {
   447.1 --- a/src/video/vgl/SDL_vglvideo.h	Tue Feb 21 08:34:45 2006 +0000
   447.2 +++ b/src/video/vgl/SDL_vglvideo.h	Tue Feb 21 08:46:50 2006 +0000
   447.3 @@ -19,6 +19,7 @@
   447.4      Sam Lantinga
   447.5      slouken@libsdl.org
   447.6  */
   447.7 +#include "SDL_config.h"
   447.8  
   447.9  #ifndef _SDL_vglvideo_h
  447.10  #define _SDL_vglvideo_h
   448.1 --- a/src/video/wincommon/SDL_lowvideo.h	Tue Feb 21 08:34:45 2006 +0000
   448.2 +++ b/src/video/wincommon/SDL_lowvideo.h	Tue Feb 21 08:46:50 2006 +0000
   448.3 @@ -19,6 +19,7 @@
   448.4      Sam Lantinga
   448.5      slouken@libsdl.org
   448.6  */
   448.7 +#include "SDL_config.h"
   448.8  
   448.9  #ifndef _SDL_lowvideo_h
  448.10  #define _SDL_lowvideo_h
   449.1 --- a/src/video/wincommon/SDL_sysevents.c	Tue Feb 21 08:34:45 2006 +0000
   449.2 +++ b/src/video/wincommon/SDL_sysevents.c	Tue Feb 21 08:46:50 2006 +0000
   449.3 @@ -19,6 +19,7 @@
   449.4      Sam Lantinga
   449.5      slouken@libsdl.org
   449.6  */
   449.7 +#include "SDL_config.h"
   449.8  
   449.9  #include "SDL_windows.h"
  449.10  
   450.1 --- a/src/video/wincommon/SDL_sysmouse.c	Tue Feb 21 08:34:45 2006 +0000
   450.2 +++ b/src/video/wincommon/SDL_sysmouse.c	Tue Feb 21 08:46:50 2006 +0000
   450.3 @@ -19,6 +19,7 @@
   450.4      Sam Lantinga
   450.5      slouken@libsdl.org
   450.6  */
   450.7 +#include "SDL_config.h"
   450.8  
   450.9  #include "SDL_windows.h"
  450.10  
   451.1 --- a/src/video/wincommon/SDL_sysmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   451.2 +++ b/src/video/wincommon/SDL_sysmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   451.3 @@ -19,6 +19,7 @@
   451.4      Sam Lantinga
   451.5      slouken@libsdl.org
   451.6  */
   451.7 +#include "SDL_config.h"
   451.8  
   451.9  #include "SDL_lowvideo.h"
  451.10  
   452.1 --- a/src/video/wincommon/SDL_syswm.c	Tue Feb 21 08:34:45 2006 +0000
   452.2 +++ b/src/video/wincommon/SDL_syswm.c	Tue Feb 21 08:46:50 2006 +0000
   452.3 @@ -19,6 +19,7 @@
   452.4      Sam Lantinga
   452.5      slouken@libsdl.org
   452.6  */
   452.7 +#include "SDL_config.h"
   452.8  
   452.9  #include "SDL_windows.h"
  452.10  
   453.1 --- a/src/video/wincommon/SDL_syswm_c.h	Tue Feb 21 08:34:45 2006 +0000
   453.2 +++ b/src/video/wincommon/SDL_syswm_c.h	Tue Feb 21 08:46:50 2006 +0000
   453.3 @@ -19,6 +19,7 @@
   453.4      Sam Lantinga
   453.5      slouken@libsdl.org
   453.6  */
   453.7 +#include "SDL_config.h"
   453.8  
   453.9  #include "SDL_lowvideo.h"
  453.10  
   454.1 --- a/src/video/wincommon/SDL_wingl.c	Tue Feb 21 08:34:45 2006 +0000
   454.2 +++ b/src/video/wincommon/SDL_wingl.c	Tue Feb 21 08:46:50 2006 +0000
   454.3 @@ -19,6 +19,7 @@
   454.4      Sam Lantinga
   454.5      slouken@libsdl.org
   454.6  */
   454.7 +#include "SDL_config.h"
   454.8  
   454.9  /* WGL implementation of SDL OpenGL support */
  454.10  
   455.1 --- a/src/video/wincommon/SDL_wingl_c.h	Tue Feb 21 08:34:45 2006 +0000
   455.2 +++ b/src/video/wincommon/SDL_wingl_c.h	Tue Feb 21 08:46:50 2006 +0000
   455.3 @@ -19,6 +19,7 @@
   455.4      Sam Lantinga
   455.5      slouken@libsdl.org
   455.6  */
   455.7 +#include "SDL_config.h"
   455.8  
   455.9  /* WGL implementation of SDL OpenGL support */
  455.10  
   456.1 --- a/src/video/windib/SDL_dibevents.c	Tue Feb 21 08:34:45 2006 +0000
   456.2 +++ b/src/video/windib/SDL_dibevents.c	Tue Feb 21 08:46:50 2006 +0000
   456.3 @@ -19,6 +19,7 @@
   456.4      Sam Lantinga
   456.5      slouken@libsdl.org
   456.6  */
   456.7 +#include "SDL_config.h"
   456.8  
   456.9  #include "SDL_windows.h"
  456.10  
   457.1 --- a/src/video/windib/SDL_dibevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   457.2 +++ b/src/video/windib/SDL_dibevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   457.3 @@ -19,6 +19,7 @@
   457.4      Sam Lantinga
   457.5      slouken@libsdl.org
   457.6  */
   457.7 +#include "SDL_config.h"
   457.8  
   457.9  #include "../wincommon/SDL_lowvideo.h"
  457.10  
   458.1 --- a/src/video/windib/SDL_dibvideo.c	Tue Feb 21 08:34:45 2006 +0000
   458.2 +++ b/src/video/windib/SDL_dibvideo.c	Tue Feb 21 08:46:50 2006 +0000
   458.3 @@ -19,6 +19,7 @@
   458.4      Sam Lantinga
   458.5      slouken@libsdl.org
   458.6  */
   458.7 +#include "SDL_config.h"
   458.8  
   458.9  #include "SDL_windows.h"
  458.10  
   459.1 --- a/src/video/windib/SDL_dibvideo.h	Tue Feb 21 08:34:45 2006 +0000
   459.2 +++ b/src/video/windib/SDL_dibvideo.h	Tue Feb 21 08:46:50 2006 +0000
   459.3 @@ -19,6 +19,7 @@
   459.4      Sam Lantinga
   459.5      slouken@libsdl.org
   459.6  */
   459.7 +#include "SDL_config.h"
   459.8  
   459.9  #ifndef _SDL_dibvideo_h
  459.10  #define _SDL_dibvideo_h
   460.1 --- a/src/video/windx5/SDL_dx5events.c	Tue Feb 21 08:34:45 2006 +0000
   460.2 +++ b/src/video/windx5/SDL_dx5events.c	Tue Feb 21 08:46:50 2006 +0000
   460.3 @@ -19,6 +19,7 @@
   460.4      Sam Lantinga
   460.5      slouken@libsdl.org
   460.6  */
   460.7 +#include "SDL_config.h"
   460.8  
   460.9  /* CAUTION!!!!  If you modify this file, check ../windib/SDL_sysevents.c */
  460.10  
   461.1 --- a/src/video/windx5/SDL_dx5events_c.h	Tue Feb 21 08:34:45 2006 +0000
   461.2 +++ b/src/video/windx5/SDL_dx5events_c.h	Tue Feb 21 08:46:50 2006 +0000
   461.3 @@ -19,6 +19,7 @@
   461.4      Sam Lantinga
   461.5      slouken@libsdl.org
   461.6  */
   461.7 +#include "SDL_config.h"
   461.8  
   461.9  #include "../wincommon/SDL_lowvideo.h"
  461.10  
   462.1 --- a/src/video/windx5/SDL_dx5video.c	Tue Feb 21 08:34:45 2006 +0000
   462.2 +++ b/src/video/windx5/SDL_dx5video.c	Tue Feb 21 08:46:50 2006 +0000
   462.3 @@ -19,6 +19,7 @@
   462.4      Sam Lantinga
   462.5      slouken@libsdl.org
   462.6  */
   462.7 +#include "SDL_config.h"
   462.8  
   462.9  #include "directx.h"
  462.10  
   463.1 --- a/src/video/windx5/SDL_dx5video.h	Tue Feb 21 08:34:45 2006 +0000
   463.2 +++ b/src/video/windx5/SDL_dx5video.h	Tue Feb 21 08:46:50 2006 +0000
   463.3 @@ -19,6 +19,7 @@
   463.4      Sam Lantinga
   463.5      slouken@libsdl.org
   463.6  */
   463.7 +#include "SDL_config.h"
   463.8  
   463.9  #ifndef _SDL_dx5video_h
  463.10  #define _SDL_dx5video_h
   464.1 --- a/src/video/windx5/SDL_dx5yuv.c	Tue Feb 21 08:34:45 2006 +0000
   464.2 +++ b/src/video/windx5/SDL_dx5yuv.c	Tue Feb 21 08:46:50 2006 +0000
   464.3 @@ -19,6 +19,7 @@
   464.4      Sam Lantinga
   464.5      slouken@libsdl.org
   464.6  */
   464.7 +#include "SDL_config.h"
   464.8  
   464.9  /* This is the DirectDraw implementation of YUV video overlays */
  464.10  
   465.1 --- a/src/video/windx5/SDL_dx5yuv_c.h	Tue Feb 21 08:34:45 2006 +0000
   465.2 +++ b/src/video/windx5/SDL_dx5yuv_c.h	Tue Feb 21 08:46:50 2006 +0000
   465.3 @@ -19,6 +19,7 @@
   465.4      Sam Lantinga
   465.5      slouken@libsdl.org
   465.6  */
   465.7 +#include "SDL_config.h"
   465.8  
   465.9  /* This is the DirectDraw implementation of YUV video overlays */
  465.10  
   466.1 --- a/src/video/wscons/SDL_wsconsevents.c	Tue Feb 21 08:34:45 2006 +0000
   466.2 +++ b/src/video/wscons/SDL_wsconsevents.c	Tue Feb 21 08:46:50 2006 +0000
   466.3 @@ -19,6 +19,7 @@
   466.4      Sam Lantinga
   466.5      slouken@libsdl.org
   466.6  */
   466.7 +#include "SDL_config.h"
   466.8  
   466.9  #include <sys/types.h>
  466.10  #include <dev/wscons/wsdisplay_usl_io.h>
   467.1 --- a/src/video/wscons/SDL_wsconsevents_c.h	Tue Feb 21 08:34:45 2006 +0000
   467.2 +++ b/src/video/wscons/SDL_wsconsevents_c.h	Tue Feb 21 08:46:50 2006 +0000
   467.3 @@ -19,6 +19,7 @@
   467.4      Sam Lantinga
   467.5      slouken@libsdl.org
   467.6  */
   467.7 +#include "SDL_config.h"
   467.8  
   467.9  #include "SDL_wsconsvideo.h"
  467.10  
   468.1 --- a/src/video/wscons/SDL_wsconsmouse.c	Tue Feb 21 08:34:45 2006 +0000
   468.2 +++ b/src/video/wscons/SDL_wsconsmouse.c	Tue Feb 21 08:46:50 2006 +0000
   468.3 @@ -19,6 +19,7 @@
   468.4      Sam Lantinga
   468.5      slouken@libsdl.org
   468.6  */
   468.7 +#include "SDL_config.h"
   468.8  
   468.9  #include "SDL_mouse.h"
  468.10  #include "../../events/SDL_events_c.h"
   469.1 --- a/src/video/wscons/SDL_wsconsmouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   469.2 +++ b/src/video/wscons/SDL_wsconsmouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   469.3 @@ -19,6 +19,7 @@
   469.4      Sam Lantinga
   469.5      slouken@libsdl.org
   469.6  */
   469.7 +#include "SDL_config.h"
   469.8  
   469.9  #include "SDL_wsconsvideo.h"
  469.10  
   470.1 --- a/src/video/wscons/SDL_wsconsvideo.c	Tue Feb 21 08:34:45 2006 +0000
   470.2 +++ b/src/video/wscons/SDL_wsconsvideo.c	Tue Feb 21 08:46:50 2006 +0000
   470.3 @@ -19,6 +19,7 @@
   470.4      Sam Lantinga
   470.5      slouken@libsdl.org
   470.6  */
   470.7 +#include "SDL_config.h"
   470.8  
   470.9  #include <sys/time.h>
  470.10  #include <sys/mman.h>
   471.1 --- a/src/video/wscons/SDL_wsconsvideo.h	Tue Feb 21 08:34:45 2006 +0000
   471.2 +++ b/src/video/wscons/SDL_wsconsvideo.h	Tue Feb 21 08:46:50 2006 +0000
   471.3 @@ -19,6 +19,7 @@
   471.4      Sam Lantinga
   471.5      slouken@libsdl.org
   471.6  */
   471.7 +#include "SDL_config.h"
   471.8  
   471.9  #ifndef _SDL_wsconsvideo_h
  471.10  #define _SDL_wsconsvideo_h
   472.1 --- a/src/video/x11/SDL_x11dga.c	Tue Feb 21 08:34:45 2006 +0000
   472.2 +++ b/src/video/x11/SDL_x11dga.c	Tue Feb 21 08:46:50 2006 +0000
   472.3 @@ -19,6 +19,7 @@
   472.4      Sam Lantinga
   472.5      slouken@libsdl.org
   472.6  */
   472.7 +#include "SDL_config.h"
   472.8  
   472.9  /* This is currently only used to enable DGA mouse.
  472.10     The new fullscreen code makes it very difficult to handle DGA dynamically.
   473.1 --- a/src/video/x11/SDL_x11dga_c.h	Tue Feb 21 08:34:45 2006 +0000
   473.2 +++ b/src/video/x11/SDL_x11dga_c.h	Tue Feb 21 08:46:50 2006 +0000
   473.3 @@ -19,6 +19,7 @@
   473.4      Sam Lantinga
   473.5      slouken@libsdl.org
   473.6  */
   473.7 +#include "SDL_config.h"
   473.8  
   473.9  #include "SDL_x11video.h"
  473.10  
   474.1 --- a/src/video/x11/SDL_x11dyn.c	Tue Feb 21 08:34:45 2006 +0000
   474.2 +++ b/src/video/x11/SDL_x11dyn.c	Tue Feb 21 08:46:50 2006 +0000
   474.3 @@ -19,13 +19,12 @@
   474.4      Sam Lantinga
   474.5      slouken@libsdl.org
   474.6  */
   474.7 +#include "SDL_config.h"
   474.8  
   474.9  #if 0
  474.10  #define DEBUG_DYNAMIC_X11 1
  474.11  #endif
  474.12  
  474.13 -#include "SDL_config.h"
  474.14 -
  474.15  #define __SDL_NO_REDEFINE_X11_HEADER_SYMS 1
  474.16  #include "SDL_x11dyn.h"
  474.17  
   475.1 --- a/src/video/x11/SDL_x11dyn.h	Tue Feb 21 08:34:45 2006 +0000
   475.2 +++ b/src/video/x11/SDL_x11dyn.h	Tue Feb 21 08:46:50 2006 +0000
   475.3 @@ -19,6 +19,7 @@
   475.4      Sam Lantinga
   475.5      slouken@libsdl.org
   475.6  */
   475.7 +#include "SDL_config.h"
   475.8  
   475.9  #ifndef _SDL_x11dyn_h
  475.10  #define _SDL_x11dyn_h
   476.1 --- a/src/video/x11/SDL_x11events.c	Tue Feb 21 08:34:45 2006 +0000
   476.2 +++ b/src/video/x11/SDL_x11events.c	Tue Feb 21 08:46:50 2006 +0000
   476.3 @@ -19,6 +19,7 @@
   476.4      Sam Lantinga
   476.5      slouken@libsdl.org
   476.6  */
   476.7 +#include "SDL_config.h"
   476.8  
   476.9  /* Handle the event stream, converting X11 events into SDL events */
  476.10  
   477.1 --- a/src/video/x11/SDL_x11events_c.h	Tue Feb 21 08:34:45 2006 +0000
   477.2 +++ b/src/video/x11/SDL_x11events_c.h	Tue Feb 21 08:46:50 2006 +0000
   477.3 @@ -19,6 +19,7 @@
   477.4      Sam Lantinga
   477.5      slouken@libsdl.org
   477.6  */
   477.7 +#include "SDL_config.h"
   477.8  
   477.9  #include "SDL_x11video.h"
  477.10  
   478.1 --- a/src/video/x11/SDL_x11gamma.c	Tue Feb 21 08:34:45 2006 +0000
   478.2 +++ b/src/video/x11/SDL_x11gamma.c	Tue Feb 21 08:46:50 2006 +0000
   478.3 @@ -19,6 +19,7 @@
   478.4      Sam Lantinga
   478.5      slouken@libsdl.org
   478.6  */
   478.7 +#include "SDL_config.h"
   478.8  
   478.9  #include "SDL.h"
  478.10  #include "SDL_events.h"
   479.1 --- a/src/video/x11/SDL_x11gamma_c.h	Tue Feb 21 08:34:45 2006 +0000
   479.2 +++ b/src/video/x11/SDL_x11gamma_c.h	Tue Feb 21 08:46:50 2006 +0000
   479.3 @@ -19,6 +19,7 @@
   479.4      Sam Lantinga
   479.5      slouken@libsdl.org
   479.6  */
   479.7 +#include "SDL_config.h"
   479.8  
   479.9  #ifndef _SDL_x11gamma_h
  479.10  #define _SDL_x11gamma_h
   480.1 --- a/src/video/x11/SDL_x11gl.c	Tue Feb 21 08:34:45 2006 +0000
   480.2 +++ b/src/video/x11/SDL_x11gl.c	Tue Feb 21 08:46:50 2006 +0000
   480.3 @@ -19,17 +19,20 @@
   480.4      Sam Lantinga
   480.5      slouken@libsdl.org
   480.6  */
   480.7 +#include "SDL_config.h"
   480.8  
   480.9  #include "SDL_x11video.h"
  480.10  #include "../../events/SDL_events_c.h"
  480.11  #include "SDL_x11dga_c.h"
  480.12  #include "SDL_x11gl_c.h"
  480.13  
  480.14 -#if defined(sgi)
  480.15 +#if defined(__IRIX__)
  480.16  /* IRIX doesn't have a GL library versioning system */
  480.17  #define DEFAULT_OPENGL	"libGL.so"
  480.18 -#elif defined(MACOSX)
  480.19 +#elif defined(__MACOSX__)
  480.20  #define DEFAULT_OPENGL	"/usr/X11R6/lib/libGL.1.dylib"
  480.21 +#elif defined(__QNXNTO__)
  480.22 +#define DEFAULT_OPENGL	"libGL.so.3"
  480.23  #else
  480.24  #define DEFAULT_OPENGL	"libGL.so.1"
  480.25  #endif
   481.1 --- a/src/video/x11/SDL_x11gl_c.h	Tue Feb 21 08:34:45 2006 +0000
   481.2 +++ b/src/video/x11/SDL_x11gl_c.h	Tue Feb 21 08:46:50 2006 +0000
   481.3 @@ -19,6 +19,7 @@
   481.4      Sam Lantinga
   481.5      slouken@libsdl.org
   481.6  */
   481.7 +#include "SDL_config.h"
   481.8  
   481.9  #if SDL_VIDEO_OPENGL_GLX
  481.10  #include <GL/glx.h>
   482.1 --- a/src/video/x11/SDL_x11image.c	Tue Feb 21 08:34:45 2006 +0000
   482.2 +++ b/src/video/x11/SDL_x11image.c	Tue Feb 21 08:46:50 2006 +0000
   482.3 @@ -19,6 +19,7 @@
   482.4      Sam Lantinga
   482.5      slouken@libsdl.org
   482.6  */
   482.7 +#include "SDL_config.h"
   482.8  
   482.9  #include <stdio.h>
  482.10  #include <unistd.h>
  482.11 @@ -148,7 +149,7 @@
  482.12         static int num_cpus = 0;
  482.13  
  482.14         if(!num_cpus) {
  482.15 -#if defined(__linux)
  482.16 +#if defined(__LINUX__)
  482.17             char line[BUFSIZ];
  482.18             FILE *pstat = fopen("/proc/stat", "r");
  482.19             if ( pstat ) {
  482.20 @@ -159,7 +160,7 @@
  482.21                 }
  482.22                 fclose(pstat);
  482.23             }
  482.24 -#elif defined(__sgi)
  482.25 +#elif defined(__IRIX__)
  482.26  	   num_cpus = sysconf(_SC_NPROC_ONLN);
  482.27  #elif defined(_SC_NPROCESSORS_ONLN)
  482.28  	   /* number of processors online (SVR4.0MP compliant machines) */
   483.1 --- a/src/video/x11/SDL_x11image_c.h	Tue Feb 21 08:34:45 2006 +0000
   483.2 +++ b/src/video/x11/SDL_x11image_c.h	Tue Feb 21 08:46:50 2006 +0000
   483.3 @@ -19,6 +19,7 @@
   483.4      Sam Lantinga
   483.5      slouken@libsdl.org
   483.6  */
   483.7 +#include "SDL_config.h"
   483.8  
   483.9  #include "SDL_x11video.h"
  483.10  
   484.1 --- a/src/video/x11/SDL_x11modes.c	Tue Feb 21 08:34:45 2006 +0000
   484.2 +++ b/src/video/x11/SDL_x11modes.c	Tue Feb 21 08:46:50 2006 +0000
   484.3 @@ -19,6 +19,7 @@
   484.4      Sam Lantinga
   484.5      slouken@libsdl.org
   484.6  */
   484.7 +#include "SDL_config.h"
   484.8  
   484.9  /* Utilities for getting and setting the X display mode */
  484.10  
   485.1 --- a/src/video/x11/SDL_x11modes_c.h	Tue Feb 21 08:34:45 2006 +0000
   485.2 +++ b/src/video/x11/SDL_x11modes_c.h	Tue Feb 21 08:46:50 2006 +0000
   485.3 @@ -19,6 +19,7 @@
   485.4      Sam Lantinga
   485.5      slouken@libsdl.org
   485.6  */
   485.7 +#include "SDL_config.h"
   485.8  
   485.9  /* Utilities for getting and setting the X display mode */
  485.10  
   486.1 --- a/src/video/x11/SDL_x11mouse.c	Tue Feb 21 08:34:45 2006 +0000
   486.2 +++ b/src/video/x11/SDL_x11mouse.c	Tue Feb 21 08:46:50 2006 +0000
   486.3 @@ -19,6 +19,7 @@
   486.4      Sam Lantinga
   486.5      slouken@libsdl.org
   486.6  */
   486.7 +#include "SDL_config.h"
   486.8  
   486.9  #include <X11/Xlib.h>
  486.10  #include <X11/Xutil.h>
   487.1 --- a/src/video/x11/SDL_x11mouse_c.h	Tue Feb 21 08:34:45 2006 +0000
   487.2 +++ b/src/video/x11/SDL_x11mouse_c.h	Tue Feb 21 08:46:50 2006 +0000
   487.3 @@ -19,6 +19,7 @@
   487.4      Sam Lantinga
   487.5      slouken@libsdl.org
   487.6  */
   487.7 +#include "SDL_config.h"
   487.8  
   487.9  #include "SDL_x11video.h"
  487.10  
   488.1 --- a/src/video/x11/SDL_x11video.c	Tue Feb 21 08:34:45 2006 +0000
   488.2 +++ b/src/video/x11/SDL_x11video.c	Tue Feb 21 08:46:50 2006 +0000
   488.3 @@ -19,6 +19,7 @@
   488.4      Sam Lantinga
   488.5      slouken@libsdl.org
   488.6  */
   488.7 +#include "SDL_config.h"
   488.8  
   488.9  /* X11 based SDL video driver implementation.
  488.10     Note:  This implementation does not currently need X11 thread locking,
  488.11 @@ -266,7 +267,7 @@
  488.12  static char *get_classname(char *classname, int maxlen)
  488.13  {
  488.14  	char *spot;
  488.15 -#if defined(linux) || defined(__FreeBSD__)
  488.16 +#if defined(__LINUX__) || defined(__FREEBSD__)
  488.17  	char procfile[1024];
  488.18  	char linkfile[1024];
  488.19  	int linksize;
  488.20 @@ -280,10 +281,10 @@
  488.21  	}
  488.22  
  488.23  	/* Next look at the application's executable name */
  488.24 -#if defined(linux) || defined(__FreeBSD__)
  488.25 -#if defined(linux)
  488.26 +#if defined(__LINUX__) || defined(__FREEBSD__)
  488.27 +#if defined(__LINUX__)
  488.28  	SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid());
  488.29 -#elif defined(__FreeBSD__)
  488.30 +#elif defined(__FREEBSD__)
  488.31  	SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", getpid());
  488.32  #else
  488.33  #error Where can we find the executable name?
  488.34 @@ -299,7 +300,7 @@
  488.35  		}
  488.36  		return classname;
  488.37  	}
  488.38 -#endif /* linux */
  488.39 +#endif /* __LINUX__ */
  488.40  
  488.41  	/* Finally use the default we've used forever */
  488.42  	SDL_strlcpy(classname, "SDL_App", maxlen);
   489.1 --- a/src/video/x11/SDL_x11video.h	Tue Feb 21 08:34:45 2006 +0000
   489.2 +++ b/src/video/x11/SDL_x11video.h	Tue Feb 21 08:46:50 2006 +0000
   489.3 @@ -19,6 +19,7 @@
   489.4      Sam Lantinga
   489.5      slouken@libsdl.org
   489.6  */
   489.7 +#include "SDL_config.h"
   489.8  
   489.9  #ifndef _SDL_x11video_h
  489.10  #define _SDL_x11video_h
   490.1 --- a/src/video/x11/SDL_x11wm.c	Tue Feb 21 08:34:45 2006 +0000
   490.2 +++ b/src/video/x11/SDL_x11wm.c	Tue Feb 21 08:46:50 2006 +0000
   490.3 @@ -19,6 +19,7 @@
   490.4      Sam Lantinga
   490.5      slouken@libsdl.org
   490.6  */
   490.7 +#include "SDL_config.h"
   490.8  
   490.9  #include <X11/Xlib.h>
  490.10  #include <X11/Xutil.h>
   491.1 --- a/src/video/x11/SDL_x11wm_c.h	Tue Feb 21 08:34:45 2006 +0000
   491.2 +++ b/src/video/x11/SDL_x11wm_c.h	Tue Feb 21 08:46:50 2006 +0000
   491.3 @@ -19,6 +19,7 @@
   491.4      Sam Lantinga
   491.5      slouken@libsdl.org
   491.6  */
   491.7 +#include "SDL_config.h"
   491.8  
   491.9  #include "SDL_x11video.h"
  491.10  
   492.1 --- a/src/video/x11/SDL_x11yuv.c	Tue Feb 21 08:34:45 2006 +0000
   492.2 +++ b/src/video/x11/SDL_x11yuv.c	Tue Feb 21 08:46:50 2006 +0000
   492.3 @@ -19,11 +19,10 @@
   492.4      Sam Lantinga
   492.5      slouken@libsdl.org
   492.6  */
   492.7 +#include "SDL_config.h"
   492.8  
   492.9  /* This is the XFree86 Xv extension implementation of YUV video overlays */
  492.10  
  492.11 -#include "SDL_config.h"
  492.12 -
  492.13  #if SDL_VIDEO_DRIVER_X11_XV
  492.14  
  492.15  #include <X11/Xlib.h>
   493.1 --- a/src/video/x11/SDL_x11yuv_c.h	Tue Feb 21 08:34:45 2006 +0000
   493.2 +++ b/src/video/x11/SDL_x11yuv_c.h	Tue Feb 21 08:46:50 2006 +0000
   493.3 @@ -19,6 +19,7 @@
   493.4      Sam Lantinga
   493.5      slouken@libsdl.org
   493.6  */
   493.7 +#include "SDL_config.h"
   493.8  
   493.9  /* This is the XFree86 Xv extension implementation of YUV video overlays */
  493.10  
   494.1 --- a/src/video/xbios/SDL_xbios.c	Tue Feb 21 08:34:45 2006 +0000
   494.2 +++ b/src/video/xbios/SDL_xbios.c	Tue Feb 21 08:46:50 2006 +0000
   494.3 @@ -19,6 +19,7 @@
   494.4      Sam Lantinga
   494.5      slouken@libsdl.org
   494.6  */
   494.7 +#include "SDL_config.h"
   494.8  
   494.9  /*
  494.10   * Xbios SDL video driver
   495.1 --- a/src/video/xbios/SDL_xbios.h	Tue Feb 21 08:34:45 2006 +0000
   495.2 +++ b/src/video/xbios/SDL_xbios.h	Tue Feb 21 08:46:50 2006 +0000
   495.3 @@ -19,6 +19,7 @@
   495.4      Sam Lantinga
   495.5      slouken@libsdl.org
   495.6  */
   495.7 +#include "SDL_config.h"
   495.8  
   495.9  #ifndef _SDL_xbios_h
  495.10  #define _SDL_xbios_h
   496.1 --- a/src/video/xbios/SDL_xbios_blowup.c	Tue Feb 21 08:34:45 2006 +0000
   496.2 +++ b/src/video/xbios/SDL_xbios_blowup.c	Tue Feb 21 08:46:50 2006 +0000
   496.3 @@ -19,6 +19,7 @@
   496.4      Sam Lantinga
   496.5      slouken@libsdl.org
   496.6  */
   496.7 +#include "SDL_config.h"
   496.8  
   496.9  /*
  496.10  	Blowup extension definitions
   497.1 --- a/src/video/xbios/SDL_xbios_blowup.h	Tue Feb 21 08:34:45 2006 +0000
   497.2 +++ b/src/video/xbios/SDL_xbios_blowup.h	Tue Feb 21 08:46:50 2006 +0000
   497.3 @@ -19,6 +19,7 @@
   497.4      Sam Lantinga
   497.5      slouken@libsdl.org
   497.6  */
   497.7 +#include "SDL_config.h"
   497.8  
   497.9  /*
  497.10  	Blowup extension definitions
   498.1 --- a/src/video/xbios/SDL_xbios_centscreen.c	Tue Feb 21 08:34:45 2006 +0000
   498.2 +++ b/src/video/xbios/SDL_xbios_centscreen.c	Tue Feb 21 08:46:50 2006 +0000
   498.3 @@ -19,6 +19,7 @@
   498.4      Sam Lantinga
   498.5      slouken@libsdl.org
   498.6  */
   498.7 +#include "SDL_config.h"
   498.8  
   498.9  /*
  498.10  	Centscreen extension definitions
   499.1 --- a/src/video/xbios/SDL_xbios_centscreen.h	Tue Feb 21 08:34:45 2006 +0000
   499.2 +++ b/src/video/xbios/SDL_xbios_centscreen.h	Tue Feb 21 08:46:50 2006 +0000
   499.3 @@ -19,6 +19,7 @@
   499.4      Sam Lantinga
   499.5      slouken@libsdl.org
   499.6  */
   499.7 +#include "SDL_config.h"
   499.8  
   499.9  /*
  499.10  	Centscreen extension definitions
   500.1 --- a/src/video/xbios/SDL_xbios_sb3.c	Tue Feb 21 08:34:45 2006 +0000
   500.2 +++ b/src/video/xbios/SDL_xbios_sb3.c	Tue Feb 21 08:46:50 2006 +0000
   500.3 @@ -19,6 +19,7 @@
   500.4      Sam Lantinga
   500.5      slouken@libsdl.org
   500.6  */
   500.7 +#include "SDL_config.h"
   500.8  
   500.9  /*
  500.10  	ScreenBlaster 3 functions
   501.1 --- a/src/video/xbios/SDL_xbios_sb3.h	Tue Feb 21 08:34:45 2006 +0000
   501.2 +++ b/src/video/xbios/SDL_xbios_sb3.h	Tue Feb 21 08:46:50 2006 +0000
   501.3 @@ -19,6 +19,7 @@
   501.4      Sam Lantinga
   501.5      slouken@libsdl.org
   501.6  */
   501.7 +#include "SDL_config.h"
   501.8  
   501.9  /*
  501.10  	ScreenBlaster 3 definitions
   502.1 --- a/test/testdyngl.c	Tue Feb 21 08:34:45 2006 +0000
   502.2 +++ b/test/testdyngl.c	Tue Feb 21 08:46:50 2006 +0000
   502.3 @@ -96,16 +96,18 @@
   502.4  	SDL_Event event;
   502.5  	int done=0;
   502.6  	GLfloat pixels[NB_PIXELS*3];
   502.7 -#if defined(_WIN32)
   502.8 -	char *gl_library = "OpenGL32.DLL";
   502.9 +#if defined(__IRIX__)
  502.10 +	const char *gl_library = "libGL.so";
  502.11 +#elif defined(__MACOSX__)
  502.12 +	const char *gl_library = "/usr/X11R6/lib/libGL.1.dylib";
  502.13  #elif defined(__QNXNTO__)
  502.14 -	char *gl_library = "libGL.so.3";
  502.15 -#elif defined(_SGI_SOURCE)
  502.16 -	char *gl_library = "libGL.so";
  502.17 +	const char *gl_library = "libGL.so.3";
  502.18 +#elif defined(__WIN32__)
  502.19 +	const char *gl_library = "OpenGL32.DLL";
  502.20  #else
  502.21 -	char *gl_library = "libGL.so.1";
  502.22 +	const char *gl_library = "libGL.so.1";
  502.23  #endif
  502.24 -	
  502.25 +
  502.26  	if (argv[1]) {
  502.27  		gl_library = argv[1];
  502.28  	}