Revamp of the video system in progress - adding support for multiple displays, multiple windows, and a full video mode selection API. SDL-1.3
authorSam Lantinga <slouken@libsdl.org>
Sun, 28 May 2006 13:04:16 +0000
branchSDL-1.3
changeset 1662 782fd950bd46
parent 1661 281d3f4870e5
child 1663 11775724e3fe
Revamp of the video system in progress - adding support for multiple displays, multiple windows, and a full video mode selection API. WARNING: None of the video drivers have been updated for the new API yet! The API is still under design and very fluid. The code is now run through a consistent indent format: indent -i4 -nut -nsc -br -ce The headers are being converted to automatically generate doxygen documentation.
.indent.pro
Makefile.in
UNDER_CONSTRUCTION.txt
include/SDL.h
include/SDL_active.h
include/SDL_audio.h
include/SDL_byteorder.h
include/SDL_cdrom.h
include/SDL_compat.h
include/SDL_config_macos.h
include/SDL_config_os2.h
include/SDL_config_win32.h
include/SDL_copying.h
include/SDL_cpuinfo.h
include/SDL_endian.h
include/SDL_error.h
include/SDL_events.h
include/SDL_getenv.h
include/SDL_joystick.h
include/SDL_keyboard.h
include/SDL_keysym.h
include/SDL_loadso.h
include/SDL_main.h
include/SDL_mouse.h
include/SDL_mutex.h
include/SDL_opengl.h
include/SDL_pixels.h
include/SDL_quit.h
include/SDL_rwops.h
include/SDL_stdinc.h
include/SDL_syswm.h
include/SDL_thread.h
include/SDL_timer.h
include/SDL_version.h
include/SDL_video.h
include/begin_code.h
include/close_code.h
include/doxyfile
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.cc
src/audio/baudio/SDL_beaudio.h
src/audio/bsd/SDL_bsdaudio.c
src/audio/bsd/SDL_bsdaudio.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.c
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/dummy/SDL_dummyaudio.c
src/audio/dummy/SDL_dummyaudio.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/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/audio/windx5/directx.h
src/cdrom/SDL_cdrom.c
src/cdrom/SDL_syscdrom.h
src/cdrom/aix/SDL_syscdrom.c
src/cdrom/beos/SDL_syscdrom.cc
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/events/SDL_windowevents.c
src/file/SDL_rwops.c
src/hermes/HeadMMX.h
src/hermes/HeadX86.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/beos/SDL_bejoystick.cc
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/os2/joyos2.h
src/joystick/riscos/SDL_sysjoystick.c
src/joystick/win32/SDL_dxjoystick.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_dlcompat.c
src/loadso/mint/SDL_sysloadso.c
src/loadso/os2/SDL_sysloadso.c
src/loadso/win32/SDL_sysloadso.c
src/main/beos/SDL_BeApp.cc
src/main/beos/SDL_BeApp.h
src/main/dummy/SDL_dummy_main.c
src/main/macos/SDL_main.c
src/main/macosx/SDLMain.h
src/main/macosx/SDLMain.m
src/main/qtopia/SDL_qtopia_main.cc
src/main/win32/SDL_win32_main.c
src/stdlib/SDL_getenv.c
src/stdlib/SDL_iconv.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/thread/win32/win_ce_semaphore.c
src/thread/win32/win_ce_semaphore.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.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_glfuncs.h
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/Xext/XME/xme.c
src/video/Xext/Xinerama/Xinerama.c
src/video/Xext/Xv/Xv.c
src/video/Xext/Xv/Xvlibint.h
src/video/Xext/Xxf86dga/XF86DGA.c
src/video/Xext/Xxf86dga/XF86DGA2.c
src/video/Xext/Xxf86vm/XF86VMode.c
src/video/Xext/extensions/Xext.h
src/video/Xext/extensions/Xinerama.h
src/video/Xext/extensions/Xv.h
src/video/Xext/extensions/Xvlib.h
src/video/Xext/extensions/Xvproto.h
src/video/Xext/extensions/extutil.h
src/video/Xext/extensions/panoramiXext.h
src/video/Xext/extensions/panoramiXproto.h
src/video/Xext/extensions/xf86dga.h
src/video/Xext/extensions/xf86dga1.h
src/video/Xext/extensions/xf86dga1str.h
src/video/Xext/extensions/xf86dgastr.h
src/video/Xext/extensions/xf86vmode.h
src/video/Xext/extensions/xf86vmstr.h
src/video/Xext/extensions/xme.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_ataridevmouse.c
src/video/ataricommon/SDL_ataridevmouse_c.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_atarikeys.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/blank_cursor.h
src/video/bwindow/SDL_BView.h
src/video/bwindow/SDL_BWin.h
src/video/bwindow/SDL_lowvideo.h
src/video/bwindow/SDL_sysevents.cc
src/video/bwindow/SDL_sysevents_c.h
src/video/bwindow/SDL_sysmouse.cc
src/video/bwindow/SDL_sysmouse_c.h
src/video/bwindow/SDL_sysvideo.cc
src/video/bwindow/SDL_syswm.cc
src/video/bwindow/SDL_syswm_c.h
src/video/bwindow/SDL_sysyuv.cc
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/default_cursor.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_keys.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/e_log.h
src/video/e_pow.h
src/video/e_sqrt.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_fbkeys.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/matrox_regs.h
src/video/fbcon/riva_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_ggikeys.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/glsdl/SDL_glsdl.c
src/video/glsdl/SDL_glsdl.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_mackeys.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/math_private.h
src/video/mmx.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/os2fslib/SDL_vkeys.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_gskeys.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.cc
src/video/qtopia/SDL_QPEApp.h
src/video/qtopia/SDL_QWin.cc
src/video/qtopia/SDL_QWin.h
src/video/qtopia/SDL_lowvideo.h
src/video/qtopia/SDL_sysevents.cc
src/video/qtopia/SDL_sysevents_c.h
src/video/qtopia/SDL_sysmouse.cc
src/video/qtopia/SDL_sysmouse_c.h
src/video/qtopia/SDL_sysvideo.cc
src/video/qtopia/SDL_syswm.cc
src/video/qtopia/SDL_syswm_c.h
src/video/quartz/CGS.h
src/video/quartz/SDL_QuartzEvents.m
src/video/quartz/SDL_QuartzGL.m
src/video/quartz/SDL_QuartzKeys.h
src/video/quartz/SDL_QuartzVideo.h
src/video/quartz/SDL_QuartzVideo.m
src/video/quartz/SDL_QuartzWM.m
src/video/quartz/SDL_QuartzWindow.h
src/video/quartz/SDL_QuartzWindow.m
src/video/quartz/SDL_QuartzYUV.m
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/wincommon/wmmsg.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/windib/SDL_vkeys.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/windx5/directx.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_x11sym.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/checkkeys.c
test/graywin.c
test/loopwave.c
test/testalpha.c
test/testbitmap.c
test/testblitspeed.c
test/testcdrom.c
test/testdyngl.c
test/testerror.c
test/testfile.c
test/testgamma.c
test/testgl.c
test/testhread.c
test/testiconv.c
test/testjoystick.c
test/testkeys.c
test/testlock.c
test/testoverlay.c
test/testoverlay2.c
test/testpalette.c
test/testplatform.c
test/testsem.c
test/testsprite.c
test/testtimer.c
test/testver.c
test/testvidinfo.c
test/testwin.c
test/testwm.c
test/threadwin.c
test/torturethread.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.indent.pro	Sun May 28 13:04:16 2006 +0000
@@ -0,0 +1,1 @@
+-i4 -nut -nsc -br -ce
--- a/Makefile.in	Sun May 21 17:27:13 2006 +0000
+++ b/Makefile.in	Sun May 28 13:04:16 2006 +0000
@@ -125,6 +125,15 @@
 	    rm -f $(mandir)/man3/$$file; \
 	done
 
+indent:
+	cd $(srcdir) && \
+	find . \( \
+	    -name '*.h' -o \
+	    -name '*.c' -o \
+	    -name '*.cc' -o \
+	    -name '*.m' \) \
+	    -exec indent {} \;
+
 clean:
 	rm -rf $(objects)
 	if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UNDER_CONSTRUCTION.txt	Sun May 28 13:04:16 2006 +0000
@@ -0,0 +1,1 @@
+WARNING: This code is under construction, may not build, and is unstable!
--- a/include/SDL.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,56 @@
     slouken@libsdl.org
 */
 
-/* Main include header for the SDL library */
+/**
+ * \file SDL.h
+ *
+ * Main include header for the SDL library
+ */
+/**
+ * \mainpage Simple DirectMedia Layer (SDL)
+
+http://www.libsdl.org/
+
+* \section intro_sec Introduction
+
+This is the Simple DirectMedia Layer, a general API that provides low
+level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
+and 2D framebuffer across multiple platforms.
+
+The current version supports Linux, Windows, Windows CE, BeOS, MacOS,
+Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.
+The code contains support for AmigaOS, Dreamcast, Atari, AIX, OSF/Tru64,
+RISC OS, SymbianOS, and OS/2, but these are not officially supported.
+
+SDL is written in C, but works with C++ natively, and has bindings to
+several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
+Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
+Pike, Pliant, Python, Ruby, and Smalltalk.
+
+This library is distributed under GNU LGPL version 2, which can be
+found in the file  "COPYING".  This license allows you to use SDL
+freely in commercial programs as long as you link with the dynamic
+library.
+
+The best way to learn how to use SDL is to check out the header files in
+the "include" subdirectory and the programs in the "test" subdirectory.
+The header files and test programs are well commented and always up to date.
+More documentation is available in HTML format in "docs/index.html", and
+a documentation wiki is available online at:
+	http://www.libsdl.org/cgi/docwiki.cgi
+
+The test programs in the "test" subdirectory are in the public domain.
+
+Frequently asked questions are answered online:
+	http://www.libsdl.org/faq.php
+
+If you need help with the library, or just want to discuss SDL related
+issues, you can join the developers mailing list:
+	http://www.libsdl.org/mailing-list.php
+
+Enjoy!
+	Sam Lantinga				(slouken@libsdl.org)
+ */
 
 #ifndef _SDL_H
 #define _SDL_H
@@ -40,11 +89,14 @@
 #include "SDL_timer.h"
 #include "SDL_video.h"
 #include "SDL_version.h"
+#include "SDL_compat.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* As of version 0.5, SDL is loaded dynamically into the application */
@@ -57,8 +109,8 @@
 #define SDL_INIT_VIDEO		0x00000020
 #define SDL_INIT_CDROM		0x00000100
 #define SDL_INIT_JOYSTICK	0x00000200
-#define SDL_INIT_NOPARACHUTE	0x00100000	/* Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD	0x01000000	/* Not supported on all OS's */
+#define SDL_INIT_NOPARACHUTE	0x00100000      /* Don't catch fatal signals */
+#define SDL_INIT_EVENTTHREAD	0x01000000      /* Not supported on all OS's */
 #define SDL_INIT_EVERYTHING	0x0000FFFF
 
 /* This function loads the SDL dynamically linked library and initializes 
@@ -66,29 +118,33 @@
  * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
  * signal handlers for some commonly ignored fatal signals (like SIGSEGV)
  */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
+extern DECLSPEC int SDLCALL SDL_Init (Uint32 flags);
 
 /* This function initializes specific SDL subsystems */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
+extern DECLSPEC int SDLCALL SDL_InitSubSystem (Uint32 flags);
 
 /* This function cleans up specific SDL subsystems */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
+extern DECLSPEC void SDLCALL SDL_QuitSubSystem (Uint32 flags);
 
 /* This function returns mask of the specified subsystems which have
    been initialized.
    If 'flags' is 0, it returns a mask of all initialized subsystems.
 */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
+extern DECLSPEC Uint32 SDLCALL SDL_WasInit (Uint32 flags);
 
 /* This function cleans up all initialized subsystems and unloads the
  * dynamically linked library.  You should call it upon all exit conditions.
  */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
+extern DECLSPEC void SDLCALL SDL_Quit (void);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_H */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_active.h	Sun May 21 17:27:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL application focus event handling */
-
-#ifndef _SDL_active_h
-#define _SDL_active_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The available application states */
-#define SDL_APPMOUSEFOCUS	0x01		/* The app has mouse coverage */
-#define SDL_APPINPUTFOCUS	0x02		/* The app has input focus */
-#define SDL_APPACTIVE		0x04		/* The application is active */
-
-/* Function prototypes */
-/* 
- * This function returns the current state of the application, which is a
- * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
- * SDL_APPACTIVE.  If SDL_APPACTIVE is set, then the user is able to
- * see your application, otherwise it has been iconified or disabled.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_active_h */
--- a/include/SDL_audio.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_audio.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* Access to the raw audio mixing buffer for the SDL library */
+/**
+ * \file SDL_audio.h
+ *
+ * Access to the raw audio mixing buffer for the SDL library
+ */
 
 #ifndef _SDL_audio_h
 #define _SDL_audio_h
@@ -35,35 +39,38 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* The calculated values in this structure are calculated by SDL_OpenAudio() */
-typedef struct SDL_AudioSpec {
-	int freq;		/* DSP frequency -- samples per second */
-	Uint16 format;		/* Audio data format */
-	Uint8  channels;	/* Number of channels: 1 mono, 2 stereo */
-	Uint8  silence;		/* Audio buffer silence value (calculated) */
-	Uint16 samples;		/* Audio buffer size in samples (power of 2) */
-	Uint16 padding;		/* Necessary for some compile environments */
-	Uint32 size;		/* Audio buffer size in bytes (calculated) */
-	/* This function is called when the audio device needs more data.
-	   'stream' is a pointer to the audio data buffer
-	   'len' is the length of that buffer in bytes.
-	   Once the callback returns, the buffer will no longer be valid.
-	   Stereo samples are stored in a LRLRLR ordering.
-	*/
-	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
-	void  *userdata;
+typedef struct SDL_AudioSpec
+{
+    int freq;                   /* DSP frequency -- samples per second */
+    Uint16 format;              /* Audio data format */
+    Uint8 channels;             /* Number of channels: 1 mono, 2 stereo */
+    Uint8 silence;              /* Audio buffer silence value (calculated) */
+    Uint16 samples;             /* Audio buffer size in samples (power of 2) */
+    Uint16 padding;             /* Necessary for some compile environments */
+    Uint32 size;                /* Audio buffer size in bytes (calculated) */
+    /* This function is called when the audio device needs more data.
+       'stream' is a pointer to the audio data buffer
+       'len' is the length of that buffer in bytes.
+       Once the callback returns, the buffer will no longer be valid.
+       Stereo samples are stored in a LRLRLR ordering.
+     */
+    void (SDLCALL * callback) (void *userdata, Uint8 * stream, int len);
+    void *userdata;
 } SDL_AudioSpec;
 
 /* Audio format flags (defaults to LSB byte order) */
-#define AUDIO_U8	0x0008	/* Unsigned 8-bit samples */
-#define AUDIO_S8	0x8008	/* Signed 8-bit samples */
-#define AUDIO_U16LSB	0x0010	/* Unsigned 16-bit samples */
-#define AUDIO_S16LSB	0x8010	/* Signed 16-bit samples */
-#define AUDIO_U16MSB	0x1010	/* As above, but big-endian byte order */
-#define AUDIO_S16MSB	0x9010	/* As above, but big-endian byte order */
+#define AUDIO_U8	0x0008  /* Unsigned 8-bit samples */
+#define AUDIO_S8	0x8008  /* Signed 8-bit samples */
+#define AUDIO_U16LSB	0x0010  /* Unsigned 16-bit samples */
+#define AUDIO_S16LSB	0x8010  /* Signed 16-bit samples */
+#define AUDIO_U16MSB	0x1010  /* As above, but big-endian byte order */
+#define AUDIO_S16MSB	0x9010  /* As above, but big-endian byte order */
 #define AUDIO_U16	AUDIO_U16LSB
 #define AUDIO_S16	AUDIO_S16LSB
 
@@ -78,18 +85,19 @@
 
 
 /* A structure to hold a set of audio conversion filters and buffers */
-typedef struct SDL_AudioCVT {
-	int needed;			/* Set to 1 if conversion possible */
-	Uint16 src_format;		/* Source audio format */
-	Uint16 dst_format;		/* Target audio format */
-	double rate_incr;		/* Rate conversion increment */
-	Uint8 *buf;			/* Buffer to hold entire audio data */
-	int    len;			/* Length of original audio buffer */
-	int    len_cvt;			/* Length of converted audio buffer */
-	int    len_mult;		/* buffer must be len*len_mult big */
-	double len_ratio; 	/* Given len, final size is len*len_ratio */
-	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
-	int filter_index;		/* Current audio conversion function */
+typedef struct SDL_AudioCVT
+{
+    int needed;                 /* Set to 1 if conversion possible */
+    Uint16 src_format;          /* Source audio format */
+    Uint16 dst_format;          /* Target audio format */
+    double rate_incr;           /* Rate conversion increment */
+    Uint8 *buf;                 /* Buffer to hold entire audio data */
+    int len;                    /* Length of original audio buffer */
+    int len_cvt;                /* Length of converted audio buffer */
+    int len_mult;               /* buffer must be len*len_mult big */
+    double len_ratio;           /* Given len, final size is len*len_ratio */
+    void (SDLCALL * filters[10]) (struct SDL_AudioCVT * cvt, Uint16 format);
+    int filter_index;           /* Current audio conversion function */
 } SDL_AudioCVT;
 
 
@@ -98,20 +106,20 @@
 /* These functions return the list of built in video drivers, in the 
  * order that they are normally initialized by default.
  */
-extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
-extern DECLSPEC const char * SDLCALL SDL_GetAudioDriver(int index);
+extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers (void);
+extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver (int index);
 
 /* These functions are used internally, and should not be used unless you
  * have a specific need to specify the audio driver you want to use.
  * You should normally use SDL_Init() or SDL_InitSubSystem().
  */
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
+extern DECLSPEC int SDLCALL SDL_AudioInit (const char *driver_name);
+extern DECLSPEC void SDLCALL SDL_AudioQuit (void);
 
 /* This function returns the name of the current audio driver, or NULL
  * if no driver has been initialized.
  */
-extern DECLSPEC const char * SDLCALL SDL_GetCurrentAudioDriver(void);
+extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver (void);
 
 /*
  * This function opens the audio device with the desired parameters, and
@@ -154,17 +162,19 @@
  * may modify the requested size of the audio buffer, you should allocate
  * any local mixing buffers after you open the audio device.
  */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
+extern DECLSPEC int SDLCALL SDL_OpenAudio (SDL_AudioSpec * desired,
+                                           SDL_AudioSpec * obtained);
 
 /*
  * Get the current audio state:
  */
-typedef enum {
-	SDL_AUDIO_STOPPED = 0,
-	SDL_AUDIO_PLAYING,
-	SDL_AUDIO_PAUSED
+typedef enum
+{
+    SDL_AUDIO_STOPPED = 0,
+    SDL_AUDIO_PLAYING,
+    SDL_AUDIO_PAUSED
 } SDL_audiostatus;
-extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);
+extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus (void);
 
 /*
  * This function pauses and unpauses the audio callback processing.
@@ -173,7 +183,7 @@
  * data for your callback function after opening the audio device.
  * Silence will be written to the audio device during the pause.
  */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
+extern DECLSPEC void SDLCALL SDL_PauseAudio (int pause_on);
 
 /*
  * This function loads a WAVE from the data source, automatically freeing
@@ -192,7 +202,11 @@
  * wave file cannot be opened, uses an unknown data format, or is 
  * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
  */
-extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
+extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW (SDL_RWops * src,
+                                                       int freesrc,
+                                                       SDL_AudioSpec * spec,
+                                                       Uint8 ** audio_buf,
+                                                       Uint32 * audio_len);
 
 /* Compatibility convenience function -- loads a WAV from a file */
 #define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
@@ -201,7 +215,7 @@
 /*
  * This function frees data previously allocated with SDL_LoadWAV_RW()
  */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf);
+extern DECLSPEC void SDLCALL SDL_FreeWAV (Uint8 * audio_buf);
 
 /*
  * This function takes a source format and rate and a destination format
@@ -210,9 +224,13 @@
  * to the other.
  * This function returns 0, or -1 if there was an error.
  */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
-		Uint16 src_format, Uint8 src_channels, int src_rate,
-		Uint16 dst_format, Uint8 dst_channels, int dst_rate);
+extern DECLSPEC int SDLCALL SDL_BuildAudioCVT (SDL_AudioCVT * cvt,
+                                               Uint16 src_format,
+                                               Uint8 src_channels,
+                                               int src_rate,
+                                               Uint16 dst_format,
+                                               Uint8 dst_channels,
+                                               int dst_rate);
 
 /* Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
  * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
@@ -222,7 +240,7 @@
  * cvt->buf should be allocated after the cvt structure is initialized by
  * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
  */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt);
+extern DECLSPEC int SDLCALL SDL_ConvertAudio (SDL_AudioCVT * cvt);
 
 /*
  * This takes two audio buffers of the playing audio format and mixes
@@ -232,7 +250,8 @@
  * This is provided for convenience -- you can mix your own audio data.
  */
 #define SDL_MIX_MAXVOLUME 128
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume);
+extern DECLSPEC void SDLCALL SDL_MixAudio (Uint8 * dst, const Uint8 * src,
+                                           Uint32 len, int volume);
 
 /*
  * The lock manipulated by these functions protects the callback function.
@@ -240,19 +259,23 @@
  * callback function is not running.  Do not call these from the callback
  * function or you will cause deadlock.
  */
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
+extern DECLSPEC void SDLCALL SDL_LockAudio (void);
+extern DECLSPEC void SDLCALL SDL_UnlockAudio (void);
 
 /*
  * This function shuts down audio processing and closes the audio device.
  */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
+extern DECLSPEC void SDLCALL SDL_CloseAudio (void);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_audio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_byteorder.h	Sun May 21 17:27:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_endian.h"
--- a/include/SDL_cdrom.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_cdrom.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* This is the CD-audio control API for Simple DirectMedia Layer */
+/**
+ * \file SDL_cdrom.h
+ *
+ * This is the CD-audio control API for Simple DirectMedia Layer
+ */
 
 #ifndef _SDL_cdrom_h
 #define _SDL_cdrom_h
@@ -31,7 +35,9 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* In order to use these functions, SDL_Init() must have been called
@@ -47,35 +53,38 @@
 #define SDL_DATA_TRACK	0x04
 
 /* The possible states which a CD-ROM drive can be in. */
-typedef enum {
-	CD_TRAYEMPTY,
-	CD_STOPPED,
-	CD_PLAYING,
-	CD_PAUSED,
-	CD_ERROR = -1
+typedef enum
+{
+    CD_TRAYEMPTY,
+    CD_STOPPED,
+    CD_PLAYING,
+    CD_PAUSED,
+    CD_ERROR = -1
 } CDstatus;
 
 /* Given a status, returns true if there's a disk in the drive */
 #define CD_INDRIVE(status)	((int)(status) > 0)
 
-typedef struct SDL_CDtrack {
-	Uint8 id;		/* Track number */
-	Uint8 type;		/* Data or audio track */
-	Uint16 unused;
-	Uint32 length;		/* Length, in frames, of this track */
-	Uint32 offset;		/* Offset, in frames, from start of disk */
+typedef struct SDL_CDtrack
+{
+    Uint8 id;                   /* Track number */
+    Uint8 type;                 /* Data or audio track */
+    Uint16 unused;
+    Uint32 length;              /* Length, in frames, of this track */
+    Uint32 offset;              /* Offset, in frames, from start of disk */
 } SDL_CDtrack;
 
 /* This structure is only current as of the last call to SDL_CDStatus() */
-typedef struct SDL_CD {
-	int id;			/* Private drive identifier */
-	CDstatus status;	/* Current drive status */
+typedef struct SDL_CD
+{
+    int id;                     /* Private drive identifier */
+    CDstatus status;            /* Current drive status */
 
-	/* The rest of this structure is only valid if there's a CD in drive */
-	int numtracks;		/* Number of tracks on disk */
-	int cur_track;		/* Current track position */
-	int cur_frame;		/* Current frame offset within current track */
-	SDL_CDtrack track[SDL_MAX_TRACKS+1];
+    /* The rest of this structure is only valid if there's a CD in drive */
+    int numtracks;              /* Number of tracks on disk */
+    int cur_track;              /* Current track position */
+    int cur_frame;              /* Current frame offset within current track */
+    SDL_CDtrack track[SDL_MAX_TRACKS + 1];
 } SDL_CD;
 
 /* Conversion functions from frames to Minute/Second/Frames and vice versa */
@@ -95,7 +104,7 @@
 /* Returns the number of CD-ROM drives on the system, or -1 if
    SDL_Init() has not been called with the SDL_INIT_CDROM flag.
  */
-extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);
+extern DECLSPEC int SDLCALL SDL_CDNumDrives (void);
 
 /* Returns a human-readable, system-dependent identifier for the CD-ROM.
    Example:
@@ -103,7 +112,7 @@
 	"E:"
 	"/dev/disk/ide/1/master"
 */
-extern DECLSPEC const char * SDLCALL SDL_CDName(int drive);
+extern DECLSPEC const char *SDLCALL SDL_CDName (int drive);
 
 /* Opens a CD-ROM drive for access.  It returns a drive handle on success,
    or NULL if the drive was invalid or busy.  This newly opened CD-ROM
@@ -111,13 +120,13 @@
    CD-ROM handle.
    Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
 */
-extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive);
+extern DECLSPEC SDL_CD *SDLCALL SDL_CDOpen (int drive);
 
 /* This function returns the current status of the given drive.
    If the drive has a CD in it, the table of contents of the CD and current
    play position of the CD will be stored in the SDL_CD structure.
 */
-extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom);
+extern DECLSPEC CDstatus SDLCALL SDL_CDStatus (SDL_CD * cdrom);
 
 /* Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
    tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
@@ -138,34 +147,41 @@
 
    This function returns 0, or -1 if there was an error.
 */
-extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom,
-		int start_track, int start_frame, int ntracks, int nframes);
+extern DECLSPEC int SDLCALL SDL_CDPlayTracks (SDL_CD * cdrom,
+                                              int start_track,
+                                              int start_frame, int ntracks,
+                                              int nframes);
 
 /* Play the given CD starting at 'start' frame for 'length' frames.
    It returns 0, or -1 if there was an error.
 */
-extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length);
+extern DECLSPEC int SDLCALL SDL_CDPlay (SDL_CD * cdrom, int start,
+                                        int length);
 
 /* Pause play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom);
+extern DECLSPEC int SDLCALL SDL_CDPause (SDL_CD * cdrom);
 
 /* Resume play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom);
+extern DECLSPEC int SDLCALL SDL_CDResume (SDL_CD * cdrom);
 
 /* Stop play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom);
+extern DECLSPEC int SDLCALL SDL_CDStop (SDL_CD * cdrom);
 
 /* Eject CD-ROM -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom);
+extern DECLSPEC int SDLCALL SDL_CDEject (SDL_CD * cdrom);
 
 /* Closes the handle for the CD-ROM drive */
-extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
+extern DECLSPEC void SDLCALL SDL_CDClose (SDL_CD * cdrom);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_video_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/SDL_compat.h	Sun May 28 13:04:16 2006 +0000
@@ -0,0 +1,126 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+/* This file contains functions for backwards compatibility with SDL 1.2 */
+
+#ifndef _SDL_compat_h
+#define _SDL_compat_h
+
+#include "SDL_syswm.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    extern DECLSPEC char *SDLCALL SDL_AudioDriverName (char *namebuf,
+                                                       int maxlen);
+    extern DECLSPEC char *SDLCALL SDL_VideoDriverName (char *namebuf,
+                                                       int maxlen);
+    extern DECLSPEC int SDLCALL SDL_VideoModeOK (int width, int height,
+                                                 int bpp, Uint32 flags);
+    extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes (SDL_PixelFormat *
+                                                      format, Uint32 flags);
+    extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode (int width,
+                                                           int height,
+                                                           int bpp,
+                                                           Uint32 flags);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif                          /* _SDL_compat_h */
+
+extern DECLSPEC SDL_Surface *SDLCALL SDL_GetVideoSurface (void);
+
+/* These are the currently supported flags for the SDL_surface */
+/* Available for SDL_CreateRGBSurface() or SDL_SetVideoMode() */
+#define SDL_SWSURFACE	0x00000000      /* Surface is in system memory */
+#define SDL_HWSURFACE	0x00000001      /* Surface is in video memory */
+#define SDL_ASYNCBLIT	0x00000004      /* Use asynchronous blits if possible */
+/* Available for SDL_SetVideoMode() */
+#define SDL_ANYFORMAT	0x10000000      /* Allow any video depth/pixel-format */
+#define SDL_HWPALETTE	0x20000000      /* Surface has exclusive palette */
+#define SDL_DOUBLEBUF	0x40000000      /* Set up double-buffered video mode */
+#define SDL_FULLSCREEN	0x80000000      /* Surface is a full screen display */
+#define SDL_OPENGL      0x00000002      /* Create an OpenGL rendering context */
+#define SDL_INTERNALOPENGL 0x00000008   /* SDL uses OpenGL internally for this window */
+#define SDL_RESIZABLE	0x00000010      /* This video mode may be resized */
+#define SDL_NOFRAME	0x00000020      /* No window caption or edge frame */
+/* Used internally (read-only) */
+#define SDL_HWACCEL	0x00000100      /* Blit uses hardware acceleration */
+#define SDL_SRCCOLORKEY	0x00001000      /* Blit uses a source color key */
+#define SDL_RLEACCELOK	0x00002000      /* Private flag */
+#define SDL_RLEACCEL	0x00004000      /* Surface is RLE encoded */
+#define SDL_SRCALPHA	0x00010000      /* Blit uses source alpha blending */
+
+extern DECLSPEC void SDLCALL SDL_WM_SetCaption (const char *title,
+                                                const char *icon);
+extern DECLSPEC void SDLCALL SDL_WM_GetCaption (char **title, char **icon);
+extern DECLSPEC void SDLCALL SDL_WM_SetIcon (SDL_Surface * icon,
+                                             Uint8 * mask);
+extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow (void);
+extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen (SDL_Surface * surface);
+typedef enum
+{
+    SDL_GRAB_QUERY = -1,
+    SDL_GRAB_OFF = 0,
+    SDL_GRAB_ON = 1
+} SDL_GrabMode;
+extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput (SDL_GrabMode mode);
+
+/* The available application states */
+#define SDL_APPMOUSEFOCUS	0x01    /* The app has mouse coverage */
+#define SDL_APPINPUTFOCUS	0x02    /* The app has input focus */
+#define SDL_APPACTIVE		0x04    /* The application is active */
+
+extern DECLSPEC Uint8 SDLCALL SDL_GetAppState (void);
+extern DECLSPEC const SDL_version *SDLCALL SDL_Linked_Version (void);
+/* flags for SDL_SetPalette() */
+#define SDL_LOGPAL 0x01
+#define SDL_PHYSPAL 0x02
+
+/*
+ * Sets a portion of the colormap for a given 8-bit surface.
+ * 'flags' is one or both of:
+ * SDL_LOGPAL  -- set logical palette, which controls how blits are mapped
+ *                to/from the surface,
+ * SDL_PHYSPAL -- set physical palette, which controls how pixels look on
+ *                the screen
+ * Only screens have physical palettes. Separate change of physical/logical
+ * palettes is only possible if the screen has SDL_HWPALETTE set.
+ *
+ * The return value is 1 if all colours could be set as requested, and 0
+ * otherwise.
+ *
+ * SDL_SetColors() is equivalent to calling this function with
+ *     flags = (SDL_LOGPAL|SDL_PHYSPAL).
+ */
+extern DECLSPEC int SDLCALL SDL_SetPalette (SDL_Surface * surface, int flags,
+                                            SDL_Color * colors,
+                                            int firstcolor, int ncolors);
+extern DECLSPEC int SDLCALL SDL_GetWMInfo (SDL_SysWMinfo * info);
--- a/include/SDL_config_macos.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_config_macos.h	Sun May 28 13:04:16 2006 +0000
@@ -29,15 +29,15 @@
 
 #include <MacTypes.h>
 
-typedef SInt8	int8_t;
-typedef UInt8	uint8_t;
-typedef SInt16	int16_t;
-typedef UInt16	uint16_t;
-typedef SInt32	int32_t;
-typedef UInt32	uint32_t;
-typedef SInt64	int64_t;
-typedef UInt64	uint64_t;
-typedef unsigned long	uintptr_t;
+typedef SInt8 int8_t;
+typedef UInt8 uint8_t;
+typedef SInt16 int16_t;
+typedef UInt16 uint16_t;
+typedef SInt32 int32_t;
+typedef UInt32 uint32_t;
+typedef SInt64 int64_t;
+typedef UInt64 uint64_t;
+typedef unsigned long uintptr_t;
 
 #define SDL_HAS_64BIT_TYPE	1
 
--- a/include/SDL_config_os2.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_config_os2.h	Sun May 28 13:04:16 2006 +0000
@@ -27,16 +27,16 @@
 
 /* This is a set of defines to configure the SDL features */
 
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef unsigned int size_t;
+typedef unsigned long uintptr_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
 
 #define SDL_HAS_64BIT_TYPE	1
 
--- a/include/SDL_config_win32.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_config_win32.h	Sun May 28 13:04:16 2006 +0000
@@ -28,19 +28,19 @@
 /* This is a set of defines to configure the SDL features */
 
 #ifdef _MSC_VER
-typedef signed __int8		int8_t;
-typedef unsigned __int8		uint8_t;
-typedef signed __int16		int16_t;
-typedef unsigned __int16	uint16_t;
-typedef signed __int32		int32_t;
-typedef unsigned __int32	uint32_t;
-typedef signed __int64		int64_t;
-typedef unsigned __int64	uint64_t;
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #ifndef _UINTPTR_T_DEFINED
 #ifdef  _WIN64
-typedef unsigned __int64    uintptr_t;
+typedef unsigned __int64 uintptr_t;
 #else
-typedef unsigned int   uintptr_t;
+typedef unsigned int uintptr_t;
 #endif
 #define _UINTPTR_T_DEFINED
 #endif
--- a/include/SDL_copying.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_copying.h	Sun May 28 13:04:16 2006 +0000
@@ -19,4 +19,3 @@
     Sam Lantinga
     slouken@libsdl.org
 */
-
--- a/include/SDL_cpuinfo.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_cpuinfo.h	Sun May 28 13:04:16 2006 +0000
@@ -20,8 +20,11 @@
     slouken@libsdl.org
 */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* CPU feature detection for SDL                                       */
+/**
+ * \file SDL_cpuinfo.h
+ *
+ * CPU feature detection for SDL
+ */
 
 #ifndef _SDL_cpuinfo_h
 #define _SDL_cpuinfo_h
@@ -31,45 +34,51 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* This function returns true if the CPU has the RDTSC instruction
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC (void);
 
 /* This function returns true if the CPU has MMX features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX (void);
 
 /* This function returns true if the CPU has MMX Ext. features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt (void);
 
 /* This function returns true if the CPU has 3DNow features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow (void);
 
 /* This function returns true if the CPU has 3DNow! Ext. features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt (void);
 
 /* This function returns true if the CPU has SSE features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE (void);
 
 /* This function returns true if the CPU has SSE2 features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2 (void);
 
 /* This function returns true if the CPU has AltiVec features
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec (void);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_cpuinfo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_endian.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_endian.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* Functions for reading and writing endian-specific values */
+/**
+ * \file SDL_endian.h
+ *
+ * Functions for reading and writing endian-specific values
+ */
 
 #ifndef _SDL_endian_h
 #define _SDL_endian_h
@@ -31,7 +35,7 @@
 #define SDL_LIL_ENDIAN	1234
 #define SDL_BIG_ENDIAN	4321
 
-#ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -47,7 +51,9 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* Use inline functions for compilers that support them, and static
@@ -57,104 +63,125 @@
 */
 #if defined(__GNUC__) && defined(__i386__) && \
    !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
+static __inline__ Uint16
+SDL_Swap16 (Uint16 x)
 {
-	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
-	return x;
+  __asm__ ("xchgb %b0,%h0": "=q" (x):"0" (x));
+    return x;
 }
 #elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
+static __inline__ Uint16
+SDL_Swap16 (Uint16 x)
 {
-	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
-	return x;
+  __asm__ ("xchgb %b0,%h0": "=Q" (x):"0" (x));
+    return x;
 }
 #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
+static __inline__ Uint16
+SDL_Swap16 (Uint16 x)
 {
-	Uint16 result;
+    Uint16 result;
 
-	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
-	return result;
+  __asm__ ("rlwimi %0,%2,8,16,23": "=&r" (result):"0" (x >> 8), "r" (x));
+    return result;
 }
 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
+static __inline__ Uint16
+SDL_Swap16 (Uint16 x)
 {
-	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
+  __asm__ ("rorw #8,%0": "=d" (x): "0" (x):"cc");
+    return x;
 }
 #else
-static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
+static __inline__ Uint16
+SDL_Swap16 (Uint16 x)
+{
+    return ((x << 8) | (x >> 8));
 }
 #endif
 
 #if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
+static __inline__ Uint32
+SDL_Swap32 (Uint32 x)
 {
-	__asm__("bswap %0" : "=r" (x) : "0" (x));
-	return x;
+  __asm__ ("bswap %0": "=r" (x):"0" (x));
+    return x;
 }
 #elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
+static __inline__ Uint32
+SDL_Swap32 (Uint32 x)
 {
-	__asm__("bswapl %0" : "=r" (x) : "0" (x));
-	return x;
+  __asm__ ("bswapl %0": "=r" (x):"0" (x));
+    return x;
 }
 #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
+static __inline__ Uint32
+SDL_Swap32 (Uint32 x)
 {
-	Uint32 result;
+    Uint32 result;
 
-	__asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (x>>24), "r" (x));
-	__asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (x));
-	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
-	return result;
+  __asm__ ("rlwimi %0,%2,24,16,23": "=&r" (result):"0" (x >> 24),
+             "r" (x));
+  __asm__ ("rlwimi %0,%2,8,8,15": "=&r" (result):"0" (result), "r" (x));
+  __asm__ ("rlwimi %0,%2,24,0,7": "=&r" (result):"0" (result), "r" (x));
+    return result;
 }
 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
+static __inline__ Uint32
+SDL_Swap32 (Uint32 x)
 {
-	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
+  __asm__ ("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d" (x): "0" (x):"cc");
+    return x;
 }
 #else
-static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
+static __inline__ Uint32
+SDL_Swap32 (Uint32 x)
+{
+    return ((x << 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) |
+            (x >> 24));
 }
 #endif
 
 #ifdef SDL_HAS_64BIT_TYPE
 #if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
+static __inline__ Uint64
+SDL_Swap64 (Uint64 x)
 {
-	union { 
-		struct { Uint32 a,b; } s;
-		Uint64 u;
-	} v;
-	v.u = x;
-	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
-	        : "=r" (v.s.a), "=r" (v.s.b) 
-	        : "0" (v.s.a), "1" (v.s.b)); 
-	return v.u;
+    union
+    {
+        struct
+        {
+            Uint32 a, b;
+        } s;
+        Uint64 u;
+    } v;
+    v.u = x;
+  __asm__ ("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r" (v.s.a), "=r" (v.s.b):"0" (v.s.a),
+             "1" (v.s.
+                  b));
+    return v.u;
 }
 #elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
+static __inline__ Uint64
+SDL_Swap64 (Uint64 x)
 {
-	__asm__("bswapq %0" : "=r" (x) : "0" (x));
-	return x;
+  __asm__ ("bswapq %0": "=r" (x):"0" (x));
+    return x;
 }
 #else
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
+static __inline__ Uint64
+SDL_Swap64 (Uint64 x)
 {
-	Uint32 hi, lo;
+    Uint32 hi, lo;
 
-	/* Separate into high and low 32-bit values and swap them */
-	lo = (Uint32)(x&0xFFFFFFFF);
-	x >>= 32;
-	hi = (Uint32)(x&0xFFFFFFFF);
-	x = SDL_Swap32(lo);
-	x <<= 32;
-	x |= SDL_Swap32(hi);
-	return(x);
+    /* Separate into high and low 32-bit values and swap them */
+    lo = (Uint32) (x & 0xFFFFFFFF);
+    x >>= 32;
+    hi = (Uint32) (x & 0xFFFFFFFF);
+    x = SDL_Swap32 (lo);
+    x <<= 32;
+    x |= SDL_Swap32 (hi);
+    return (x);
 }
 #endif
 #else
@@ -185,8 +212,12 @@
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_endian_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_error.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_error.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,10 @@
     slouken@libsdl.org
 */
 
-/* Simple error message routines for SDL */
+/**
+ * \file SDL_error.h
+ * Simple error message routines for SDL
+ */
 
 #ifndef _SDL_error_h
 #define _SDL_error_h
@@ -30,32 +33,39 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* Public functions */
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char * SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
+extern DECLSPEC void SDLCALL SDL_SetError (const char *fmt, ...);
+extern DECLSPEC char *SDLCALL SDL_GetError (void);
+extern DECLSPEC void SDLCALL SDL_ClearError (void);
 
 /* Private error message function - used internally */
 #define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
 #define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum {
-	SDL_ENOMEM,
-	SDL_EFREAD,
-	SDL_EFWRITE,
-	SDL_EFSEEK,
-	SDL_UNSUPPORTED,
-	SDL_LASTERROR
+typedef enum
+{
+    SDL_ENOMEM,
+    SDL_EFREAD,
+    SDL_EFWRITE,
+    SDL_EFSEEK,
+    SDL_UNSUPPORTED,
+    SDL_LASTERROR
 } SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
+extern DECLSPEC void SDLCALL SDL_Error (SDL_errorcode code);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_error_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_events.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_events.h	Sun May 28 13:04:16 2006 +0000
@@ -20,14 +20,18 @@
     slouken@libsdl.org
 */
 
-/* Include file for SDL event handling */
+/**
+ * \file SDL_events.h
+ *
+ * Include file for SDL event handling
+ */
 
 #ifndef _SDL_events_h
 #define _SDL_events_h
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
-#include "SDL_active.h"
+#include "SDL_video.h"
 #include "SDL_keyboard.h"
 #include "SDL_mouse.h"
 #include "SDL_joystick.h"
@@ -36,202 +40,256 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* General keyboard/mouse state definitions */
 #define SDL_RELEASED	0
 #define SDL_PRESSED	1
 
-/* Event enumerations */
-typedef enum {
-       SDL_NOEVENT = 0,			/* Unused (do not remove) */
-       SDL_ACTIVEEVENT,			/* Application loses/gains visibility */
-       SDL_KEYDOWN,			/* Keys pressed */
-       SDL_KEYUP,			/* Keys released */
-       SDL_MOUSEMOTION,			/* Mouse moved */
-       SDL_MOUSEBUTTONDOWN,		/* Mouse button pressed */
-       SDL_MOUSEBUTTONUP,		/* Mouse button released */
-       SDL_JOYAXISMOTION,		/* Joystick axis motion */
-       SDL_JOYBALLMOTION,		/* Joystick trackball motion */
-       SDL_JOYHATMOTION,		/* Joystick hat position change */
-       SDL_JOYBUTTONDOWN,		/* Joystick button pressed */
-       SDL_JOYBUTTONUP,			/* Joystick button released */
-       SDL_QUIT,			/* User-requested quit */
-       SDL_SYSWMEVENT,			/* System specific event */
-       SDL_EVENT_RESERVEDA,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVEDB,		/* Reserved for future use.. */
-       SDL_VIDEORESIZE,			/* User resized video mode */
-       SDL_VIDEOEXPOSE,			/* Screen needs to be redrawn */
-       SDL_EVENT_RESERVED2,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED3,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED4,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED5,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED6,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED7,		/* Reserved for future use.. */
-       /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-       SDL_USEREVENT = 24,
-       /* This last event is only for bounding internal arrays
-	  It is the number of bits in the event mask datatype -- Uint32
-        */
-       SDL_NUMEVENTS = 32
+/**
+ * \enum SDL_EventType
+ *
+ * \brief The types of events that can be delivered
+ */
+typedef enum
+{
+    SDL_NOEVENT = 0,            /**< Unused (do not remove) */
+    SDL_WINDOWEVENT,            /**< Window state change */
+    SDL_KEYDOWN,                /**< Keys pressed */
+    SDL_KEYUP,                  /**< Keys released */
+    SDL_MOUSEMOTION,            /**< Mouse moved */
+    SDL_MOUSEBUTTONDOWN,        /**< Mouse button pressed */
+    SDL_MOUSEBUTTONUP,          /**< Mouse button released */
+    SDL_JOYAXISMOTION,          /**< Joystick axis motion */
+    SDL_JOYBALLMOTION,          /**< Joystick trackball motion */
+    SDL_JOYHATMOTION,           /**< Joystick hat position change */
+    SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
+    SDL_JOYBUTTONUP,            /**< Joystick button released */
+    SDL_QUIT,                   /**< User-requested quit */
+    SDL_SYSWMEVENT,             /**< System specific event */
+    SDL_EVENT_RESERVED1,        /**< Reserved for future use... */
+    SDL_EVENT_RESERVED2,        /**< Reserved for future use... */
+    SDL_EVENT_RESERVED3,        /**< Reserved for future use... */
+    /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
+    SDL_USEREVENT = 24,
+    /* This last event is only for bounding internal arrays
+       It is the number of bits in the event mask datatype -- Uint32
+     */
+    SDL_NUMEVENTS = 32
 } SDL_EventType;
 
-/* Predefined event masks */
+/**
+ * \enum SDL_EventMask
+ *
+ * \brief Predefined event masks
+ */
 #define SDL_EVENTMASK(X)	(1<<(X))
-typedef enum {
-	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
-	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
-	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
-	SDL_KEYEVENTMASK	= SDL_EVENTMASK(SDL_KEYDOWN)|
-	                          SDL_EVENTMASK(SDL_KEYUP),
-	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
-	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
-	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_MOUSEEVENTMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_JOYAXISMOTIONMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION),
-	SDL_JOYBALLMOTIONMASK	= SDL_EVENTMASK(SDL_JOYBALLMOTION),
-	SDL_JOYHATMOTIONMASK	= SDL_EVENTMASK(SDL_JOYHATMOTION),
-	SDL_JOYBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
-	SDL_JOYBUTTONUPMASK	= SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_JOYEVENTMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBALLMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYHATMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_VIDEORESIZEMASK	= SDL_EVENTMASK(SDL_VIDEORESIZE),
-	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
-	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
-	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
-} SDL_EventMask ;
+typedef enum
+{
+    SDL_WINDOWEVENTMASK = SDL_EVENTMASK (SDL_WINDOWEVENT),
+    SDL_KEYDOWNMASK = SDL_EVENTMASK (SDL_KEYDOWN),
+    SDL_KEYUPMASK = SDL_EVENTMASK (SDL_KEYUP),
+    SDL_KEYEVENTMASK = SDL_EVENTMASK (SDL_KEYDOWN) |
+        SDL_EVENTMASK (SDL_KEYUP),
+    SDL_MOUSEMOTIONMASK = SDL_EVENTMASK (SDL_MOUSEMOTION),
+    SDL_MOUSEBUTTONDOWNMASK = SDL_EVENTMASK (SDL_MOUSEBUTTONDOWN),
+    SDL_MOUSEBUTTONUPMASK = SDL_EVENTMASK (SDL_MOUSEBUTTONUP),
+    SDL_MOUSEEVENTMASK = SDL_EVENTMASK (SDL_MOUSEMOTION) |
+        SDL_EVENTMASK (SDL_MOUSEBUTTONDOWN) |
+        SDL_EVENTMASK (SDL_MOUSEBUTTONUP),
+    SDL_JOYAXISMOTIONMASK = SDL_EVENTMASK (SDL_JOYAXISMOTION),
+    SDL_JOYBALLMOTIONMASK = SDL_EVENTMASK (SDL_JOYBALLMOTION),
+    SDL_JOYHATMOTIONMASK = SDL_EVENTMASK (SDL_JOYHATMOTION),
+    SDL_JOYBUTTONDOWNMASK = SDL_EVENTMASK (SDL_JOYBUTTONDOWN),
+    SDL_JOYBUTTONUPMASK = SDL_EVENTMASK (SDL_JOYBUTTONUP),
+    SDL_JOYEVENTMASK = SDL_EVENTMASK (SDL_JOYAXISMOTION) |
+        SDL_EVENTMASK (SDL_JOYBALLMOTION) |
+        SDL_EVENTMASK (SDL_JOYHATMOTION) |
+        SDL_EVENTMASK (SDL_JOYBUTTONDOWN) | SDL_EVENTMASK (SDL_JOYBUTTONUP),
+    SDL_QUITMASK = SDL_EVENTMASK (SDL_QUIT),
+    SDL_SYSWMEVENTMASK = SDL_EVENTMASK (SDL_SYSWMEVENT)
+} SDL_EventMask;
 #define SDL_ALLEVENTS		0xFFFFFFFF
 
-/* Application visibility event structure */
-typedef struct SDL_ActiveEvent {
-	Uint8 type;	/* SDL_ACTIVEEVENT */
-	Uint8 gain;	/* Whether given states were gained or lost (1/0) */
-	Uint8 state;	/* A mask of the focus states */
-} SDL_ActiveEvent;
+/**
+ * \struct SDL_WindowEvent
+ *
+ * \brief Window state change event data
+ */
+typedef struct SDL_WindowEvent
+{
+    Uint8 type;             /**< SDL_WINDOWEVENT */
+    Uint8 event;            /**< SDL_WindowEventID */
+    int data1;              /**< event dependent data */
+    int data2;              /**< event dependent data */
+    SDL_WindowID windowID;  /**< The associated window */
+} SDL_WindowEvent;
 
-/* Keyboard event structure */
-typedef struct SDL_KeyboardEvent {
-	Uint8 type;	/* SDL_KEYDOWN or SDL_KEYUP */
-	Uint8 which;	/* The keyboard device index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
-	SDL_keysym keysym;
+/**
+ * \struct SDL_KeyboardEvent
+ *
+ * \brief Keyboard event structure
+ */
+typedef struct SDL_KeyboardEvent
+{
+    Uint8 type;             /**< SDL_KEYDOWN or SDL_KEYUP */
+    Uint8 which;            /**< The keyboard device index */
+    Uint8 state;            /**< SDL_PRESSED or SDL_RELEASED */
+    SDL_keysym keysym;      /**< The key that was pressed or released */
+    SDL_WindowID windowID;  /**< The window with keyboard focus, if any */
 } SDL_KeyboardEvent;
 
-/* Mouse motion event structure */
-typedef struct SDL_MouseMotionEvent {
-	Uint8 type;	/* SDL_MOUSEMOTION */
-	Uint8 which;	/* The mouse device index */
-	Uint8 state;	/* The current button state */
-	Uint16 x, y;	/* The X/Y coordinates of the mouse */
-	Sint16 xrel;	/* The relative motion in the X direction */
-	Sint16 yrel;	/* The relative motion in the Y direction */
+/**
+ * \struct SDL_MouseMotionEvent
+ *
+ * \brief Mouse motion event structure
+ */
+typedef struct SDL_MouseMotionEvent
+{
+    Uint8 type;             /**< SDL_MOUSEMOTION */
+    Uint8 which;            /**< The mouse device index */
+    Uint8 state;            /**< The current button state */
+    int x;                  /**< X coordinate, relative to window */
+    int y;                  /**< Y coordinate, relative to window */
+    int xrel;               /**< The relative motion in the X direction */
+    int yrel;               /**< The relative motion in the Y direction */
+    SDL_WindowID windowID;  /**< The window with mouse focus, if any */
 } SDL_MouseMotionEvent;
 
-/* Mouse button event structure */
-typedef struct SDL_MouseButtonEvent {
-	Uint8 type;	/* SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
-	Uint8 which;	/* The mouse device index */
-	Uint8 button;	/* The mouse button index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
-	Uint16 x, y;	/* The X/Y coordinates of the mouse at press time */
+/**
+ * \struct SDL_MouseButtonEvent
+ *
+ * \brief Mouse button event structure
+ */
+typedef struct SDL_MouseButtonEvent
+{
+    Uint8 type;             /**< SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
+    Uint8 which;            /**< The mouse device index */
+    Uint8 button;           /**< The mouse button index */
+    Uint8 state;            /**< SDL_PRESSED or SDL_RELEASED */
+    int x;                  /**< X coordinate, relative to window */
+    int y;                  /**< Y coordinate, relative to window */
+    SDL_WindowID windowID;  /**< The window with mouse focus, if any */
 } SDL_MouseButtonEvent;
 
-/* Joystick axis motion event structure */
-typedef struct SDL_JoyAxisEvent {
-	Uint8 type;	/* SDL_JOYAXISMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 axis;	/* The joystick axis index */
-	Sint16 value;	/* The axis value (range: -32768 to 32767) */
+/**
+ * \struct SDL_JoyAxisEvent
+ *
+ * \brief Joystick axis motion event structure
+ */
+typedef struct SDL_JoyAxisEvent
+{
+    Uint8 type;         /**< SDL_JOYAXISMOTION */
+    Uint8 which;        /**< The joystick device index */
+    Uint8 axis;         /**< The joystick axis index */
+    int value;          /**< The axis value (range: -32768 to 32767) */
 } SDL_JoyAxisEvent;
 
-/* Joystick trackball motion event structure */
-typedef struct SDL_JoyBallEvent {
-	Uint8 type;	/* SDL_JOYBALLMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 ball;	/* The joystick trackball index */
-	Sint16 xrel;	/* The relative motion in the X direction */
-	Sint16 yrel;	/* The relative motion in the Y direction */
+/**
+ * \struct SDL_JoyBallEvent
+ *
+ * \brief Joystick trackball motion event structure
+ */
+typedef struct SDL_JoyBallEvent
+{
+    Uint8 type;         /**< SDL_JOYBALLMOTION */
+    Uint8 which;        /**< The joystick device index */
+    Uint8 ball;         /**< The joystick trackball index */
+    int xrel;           /**< The relative motion in the X direction */
+    int yrel;           /**< The relative motion in the Y direction */
 } SDL_JoyBallEvent;
 
-/* Joystick hat position change event structure */
-typedef struct SDL_JoyHatEvent {
-	Uint8 type;	/* SDL_JOYHATMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 hat;	/* The joystick hat index */
-	Uint8 value;	/* The hat position value:
-			    SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-			    SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-			    SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-			   Note that zero means the POV is centered.
-			*/
+/**
+ * \struct SDL_JoyHatEvent
+ *
+ * \brief Joystick hat position change event structure
+ */
+typedef struct SDL_JoyHatEvent
+{
+    Uint8 type;         /**< SDL_JOYHATMOTION */
+    Uint8 which;        /**< The joystick device index */
+    Uint8 hat;          /**< The joystick hat index */
+    Uint8 value;        /**< The hat position value:
+                             SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
+                             SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
+                             SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
+                             Note that zero means the POV is centered.
+                         */
 } SDL_JoyHatEvent;
 
-/* Joystick button event structure */
-typedef struct SDL_JoyButtonEvent {
-	Uint8 type;	/* SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
-	Uint8 which;	/* The joystick device index */
-	Uint8 button;	/* The joystick button index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
+/**
+ * \struct SDL_JoyButtonEvent
+ *
+ * \brief Joystick button event structure
+ */
+typedef struct SDL_JoyButtonEvent
+{
+    Uint8 type;         /**< SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
+    Uint8 which;        /**< The joystick device index */
+    Uint8 button;       /**< The joystick button index */
+    Uint8 state;        /**< SDL_PRESSED or SDL_RELEASED */
 } SDL_JoyButtonEvent;
 
-/* The "window resized" event
-   When you get this event, you are responsible for setting a new video
-   mode with the new width and height.
+/**
+ * \struct SDL_QuitEvent
+ *
+ * \brief The "quit requested" event
  */
-typedef struct SDL_ResizeEvent {
-	Uint8 type;	/* SDL_VIDEORESIZE */
-	int w;		/* New width */
-	int h;		/* New height */
-} SDL_ResizeEvent;
-
-/* The "screen redraw" event */
-typedef struct SDL_ExposeEvent {
-	Uint8 type;	/* SDL_VIDEOEXPOSE */
-} SDL_ExposeEvent;
-
-/* The "quit requested" event */
-typedef struct SDL_QuitEvent {
-	Uint8 type;	/* SDL_QUIT */
+typedef struct SDL_QuitEvent
+{
+    Uint8 type;         /**< SDL_QUIT */
 } SDL_QuitEvent;
 
-/* A user-defined event type */
-typedef struct SDL_UserEvent {
-	Uint8 type;	/* SDL_USEREVENT through SDL_NUMEVENTS-1 */
-	int code;	/* User defined event code */
-	void *data1;	/* User defined data pointer */
-	void *data2;	/* User defined data pointer */
+/**
+ * \struct SDL_UserEvent
+ *
+ * \brief A user-defined event type
+ */
+typedef struct SDL_UserEvent
+{
+    Uint8 type;         /**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
+    int code;           /**< User defined event code */
+    void *data1;        /**< User defined data pointer */
+    void *data2;        /**< User defined data pointer */
 } SDL_UserEvent;
 
-/* If you want to use this event, you should include SDL_syswm.h */
+/**
+ * \struct SDL_SysWMEvent
+ *
+ * \brief A video driver dependent system event
+ *
+ * \note If you want to use this event, you should include SDL_syswm.h
+ */
 struct SDL_SysWMmsg;
 typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent {
-	Uint8 type;
-	SDL_SysWMmsg *msg;
+typedef struct SDL_SysWMEvent
+{
+    Uint8 type;         /**< SDL_SYSWMEVENT */
+    SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
 } SDL_SysWMEvent;
 
-/* General event structure */
-typedef union SDL_Event {
-	Uint8 type;
-	SDL_ActiveEvent active;
-	SDL_KeyboardEvent key;
-	SDL_MouseMotionEvent motion;
-	SDL_MouseButtonEvent button;
-	SDL_JoyAxisEvent jaxis;
-	SDL_JoyBallEvent jball;
-	SDL_JoyHatEvent jhat;
-	SDL_JoyButtonEvent jbutton;
-	SDL_ResizeEvent resize;
-	SDL_ExposeEvent expose;
-	SDL_QuitEvent quit;
-	SDL_UserEvent user;
-	SDL_SysWMEvent syswm;
+/**
+ * \union SDL_Event
+ *
+ * \brief General event structure
+ */
+typedef union SDL_Event
+{
+    Uint8 type;                     /**< Event type, shared with all events */
+    SDL_WindowEvent window;         /**< Window event data */
+    SDL_KeyboardEvent key;          /**< Keyboard event data */
+    SDL_MouseMotionEvent motion;    /**< Mouse motion event data */
+    SDL_MouseButtonEvent button;    /**< Mouse button event data */
+    SDL_JoyAxisEvent jaxis;         /**< Joystick axis event data */
+    SDL_JoyBallEvent jball;         /**< Joystick ball event data */
+    SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
+    SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
+    SDL_QuitEvent quit;             /**< Quit request event data */
+    SDL_UserEvent user;             /**< Custom event data */
+    SDL_SysWMEvent syswm;           /**< System dependent window event data */
 } SDL_Event;
 
 
@@ -241,7 +299,7 @@
    This function updates the event queue and internal input device state.
    This should only be run in the thread that sets the video mode.
 */
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
+extern DECLSPEC void SDLCALL SDL_PumpEvents (void);
 
 /* Checks the event queue for messages and optionally returns them.
    If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
@@ -255,32 +313,34 @@
    This function returns the number of events actually stored, or -1
    if there was an error.  This function is thread-safe.
 */
-typedef enum {
-	SDL_ADDEVENT,
-	SDL_PEEKEVENT,
-	SDL_GETEVENT
+typedef enum
+{
+    SDL_ADDEVENT,
+    SDL_PEEKEVENT,
+    SDL_GETEVENT
 } SDL_eventaction;
 /* */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents,
-				SDL_eventaction action, Uint32 mask);
+extern DECLSPEC int SDLCALL SDL_PeepEvents (SDL_Event * events, int numevents,
+                                            SDL_eventaction action,
+                                            Uint32 mask);
 
 /* Polls for currently pending events, and returns 1 if there are any pending
    events, or 0 if there are none available.  If 'event' is not NULL, the next
    event is removed from the queue and stored in that area.
  */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event *event);
+extern DECLSPEC int SDLCALL SDL_PollEvent (SDL_Event * event);
 
 /* Waits indefinitely for the next available event, returning 1, or 0 if there
    was an error while waiting for events.  If 'event' is not NULL, the next
    event is removed from the queue and stored in that area.
  */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event *event);
+extern DECLSPEC int SDLCALL SDL_WaitEvent (SDL_Event * event);
 
 /* Add an event to the event queue.
    This function returns 0 on success, or -1 if the event queue was full
    or there was some other error.
  */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);
+extern DECLSPEC int SDLCALL SDL_PushEvent (SDL_Event * event);
 
 /*
   This function sets up a filter to process all events before they
@@ -288,7 +348,7 @@
 
   The filter is protypted as:
 */
-typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
+typedef int (SDLCALL * SDL_EventFilter) (const SDL_Event * event);
 /*
   If the filter returns 1, then the event will be added to the internal queue.
   If it returns 0, then the event will be dropped from the queue, but the 
@@ -305,13 +365,13 @@
   If the quit event is generated by an interrupt signal, it will bypass the
   internal queue and be delivered to the application at the next event poll.
 */
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);
+extern DECLSPEC void SDLCALL SDL_SetEventFilter (SDL_EventFilter filter);
 
 /*
   Return the current event filter - can be used to "chain" filters.
   If there is no event filter set, this function returns NULL.
 */
-extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);
+extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter (void);
 
 /*
   This function allows you to set the state of processing certain events.
@@ -325,13 +385,17 @@
 #define SDL_IGNORE	 0
 #define SDL_DISABLE	 0
 #define SDL_ENABLE	 1
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
+extern DECLSPEC Uint8 SDLCALL SDL_EventState (Uint8 type, int state);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_events_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_getenv.h	Sun May 21 17:27:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
--- a/include/SDL_joystick.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_joystick.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* Include file for SDL joystick event handling */
+/**
+ * \file SDL_joystick.h
+ *
+ * Include file for SDL joystick event handling
+ */
 
 #ifndef _SDL_joystick_h
 #define _SDL_joystick_h
@@ -31,7 +35,9 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* In order to use these functions, SDL_Init() must have been called
@@ -48,14 +54,14 @@
 /*
  * Count the number of joysticks attached to the system
  */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
+extern DECLSPEC int SDLCALL SDL_NumJoysticks (void);
 
 /*
  * Get the implementation dependent name of a joystick.
  * This can be called before any joysticks are opened.
  * If no name can be found, this function returns NULL.
  */
-extern DECLSPEC const char * SDLCALL SDL_JoystickName(int device_index);
+extern DECLSPEC const char *SDLCALL SDL_JoystickName (int device_index);
 
 /*
  * Open a joystick for use - the index passed as an argument refers to
@@ -64,46 +70,46 @@
  *
  * This function returns a joystick identifier, or NULL if an error occurred.
  */
-extern DECLSPEC SDL_Joystick * SDLCALL SDL_JoystickOpen(int device_index);
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen (int device_index);
 
 /*
  * Returns 1 if the joystick has been opened, or 0 if it has not.
  */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
+extern DECLSPEC int SDLCALL SDL_JoystickOpened (int device_index);
 
 /*
  * Get the device index of an opened joystick.
  */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick *joystick);
+extern DECLSPEC int SDLCALL SDL_JoystickIndex (SDL_Joystick * joystick);
 
 /*
  * Get the number of general axis controls on a joystick
  */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick);
+extern DECLSPEC int SDLCALL SDL_JoystickNumAxes (SDL_Joystick * joystick);
 
 /*
  * Get the number of trackballs on a joystick
  * Joystick trackballs have only relative motion events associated
  * with them and their state cannot be polled.
  */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick);
+extern DECLSPEC int SDLCALL SDL_JoystickNumBalls (SDL_Joystick * joystick);
 
 /*
  * Get the number of POV hats on a joystick
  */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick);
+extern DECLSPEC int SDLCALL SDL_JoystickNumHats (SDL_Joystick * joystick);
 
 /*
  * Get the number of buttons on a joystick
  */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick);
+extern DECLSPEC int SDLCALL SDL_JoystickNumButtons (SDL_Joystick * joystick);
 
 /*
  * Update the current state of the open joysticks.
  * This is called automatically by the event loop if any joystick
  * events are enabled.
  */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
+extern DECLSPEC void SDLCALL SDL_JoystickUpdate (void);
 
 /*
  * Enable/disable joystick event polling.
@@ -112,14 +118,15 @@
  * information.
  * The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
  */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
+extern DECLSPEC int SDLCALL SDL_JoystickEventState (int state);
 
 /*
  * Get the current state of an axis control on a joystick
  * The state is a value ranging from -32768 to 32767.
  * The axis indices start at index 0.
  */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis);
+extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis (SDL_Joystick * joystick,
+                                                    int axis);
 
 /*
  * Get the current state of a POV hat on a joystick
@@ -137,31 +144,38 @@
 /*
  * The hat indices start at index 0.
  */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat);
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat (SDL_Joystick * joystick,
+                                                  int hat);
 
 /*
  * Get the ball axis change since the last poll
  * This returns 0, or -1 if you passed it invalid parameters.
  * The ball indices start at index 0.
  */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy);
+extern DECLSPEC int SDLCALL SDL_JoystickGetBall (SDL_Joystick * joystick,
+                                                 int ball, int *dx, int *dy);
 
 /*
  * Get the current state of a button on a joystick
  * The button indices start at index 0.
  */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button);
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton (SDL_Joystick * joystick,
+                                                     int button);
 
 /*
  * Close a joystick previously opened with SDL_JoystickOpen()
  */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick);
+extern DECLSPEC void SDLCALL SDL_JoystickClose (SDL_Joystick * joystick);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_joystick_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_keyboard.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_keyboard.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* Include file for SDL keyboard event handling */
+/**
+ * \file SDL_keyboard.h
+ *
+ * Include file for SDL keyboard event handling
+ */
 
 #ifndef _SDL_keyboard_h
 #define _SDL_keyboard_h
@@ -32,7 +36,9 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* Keysym structure
@@ -51,11 +57,12 @@
 		An international character..
 	}
  */
-typedef struct SDL_keysym {
-	Uint8 scancode;			/* hardware specific scancode */
-	SDLKey sym;			/* SDL virtual keysym */
-	SDLMod mod;			/* current key modifiers */
-	Uint16 unicode;			/* translated character */
+typedef struct SDL_keysym
+{
+    Uint8 scancode;             /* hardware specific scancode */
+    SDLKey sym;                 /* SDL virtual keysym */
+    SDLMod mod;                 /* current key modifiers */
+    Uint16 unicode;             /* translated character */
 } SDL_keysym;
 
 /* This is the mask which refers to all hotkey bindings */
@@ -70,7 +77,7 @@
  * If 'enable' is -1, the translation state is not changed.
  * It returns the previous state of keyboard translation.
  */
-extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
+extern DECLSPEC int SDLCALL SDL_EnableUNICODE (int enable);
 
 /*
  * Enable/Disable keyboard repeat.  Keyboard repeat defaults to off.
@@ -83,8 +90,8 @@
 /*
  * If 'delay' is set to 0, keyboard repeat is disabled.
  */
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
+extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat (int delay, int interval);
+extern DECLSPEC void SDLCALL SDL_GetKeyRepeat (int *delay, int *interval);
 
 /*
  * Get a snapshot of the current state of the keyboard.
@@ -93,29 +100,33 @@
  * 	Uint8 *keystate = SDL_GetKeyState(NULL);
  *	if ( keystate[SDLK_RETURN] ) ... <RETURN> is pressed.
  */
-extern DECLSPEC Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
+extern DECLSPEC Uint8 *SDLCALL SDL_GetKeyState (int *numkeys);
 
 /*
  * Get the current key modifier state
  */
-extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);
+extern DECLSPEC SDLMod SDLCALL SDL_GetModState (void);
 
 /*
  * Set the current key modifier state
  * This does not change the keyboard state, only the key modifier flags.
  */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
+extern DECLSPEC void SDLCALL SDL_SetModState (SDLMod modstate);
 
 /*
  * Get the name of an SDL virtual keysym
  */
-extern DECLSPEC char * SDLCALL SDL_GetKeyName(SDLKey key);
+extern DECLSPEC char *SDLCALL SDL_GetKeyName (SDLKey key);
 
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_keyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_keysym.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_keysym.h	Sun May 28 13:04:16 2006 +0000
@@ -20,6 +20,10 @@
     slouken@libsdl.org
 */
 
+/**
+ * \file SDL_keysym.h
+ */
+
 #ifndef _SDL_keysym_h
 #define _SDL_keysym_h
 
@@ -28,279 +32,281 @@
    as international virtual keycodes.  We'll follow in the footsteps of X11...
    The names of the keys
  */
- 
-typedef enum {
-	/* The keyboard syms have been cleverly chosen to map to ASCII */
-	SDLK_UNKNOWN		= 0,
-	SDLK_FIRST		= 0,
-	SDLK_BACKSPACE		= 8,
-	SDLK_TAB		= 9,
-	SDLK_CLEAR		= 12,
-	SDLK_RETURN		= 13,
-	SDLK_PAUSE		= 19,
-	SDLK_ESCAPE		= 27,
-	SDLK_SPACE		= 32,
-	SDLK_EXCLAIM		= 33,
-	SDLK_QUOTEDBL		= 34,
-	SDLK_HASH		= 35,
-	SDLK_DOLLAR		= 36,
-	SDLK_AMPERSAND		= 38,
-	SDLK_QUOTE		= 39,
-	SDLK_LEFTPAREN		= 40,
-	SDLK_RIGHTPAREN		= 41,
-	SDLK_ASTERISK		= 42,
-	SDLK_PLUS		= 43,
-	SDLK_COMMA		= 44,
-	SDLK_MINUS		= 45,
-	SDLK_PERIOD		= 46,
-	SDLK_SLASH		= 47,
-	SDLK_0			= 48,
-	SDLK_1			= 49,
-	SDLK_2			= 50,
-	SDLK_3			= 51,
-	SDLK_4			= 52,
-	SDLK_5			= 53,
-	SDLK_6			= 54,
-	SDLK_7			= 55,
-	SDLK_8			= 56,
-	SDLK_9			= 57,
-	SDLK_COLON		= 58,
-	SDLK_SEMICOLON		= 59,
-	SDLK_LESS		= 60,
-	SDLK_EQUALS		= 61,
-	SDLK_GREATER		= 62,
-	SDLK_QUESTION		= 63,
-	SDLK_AT			= 64,
-	/* 
-	   Skip uppercase letters
-	 */
-	SDLK_LEFTBRACKET	= 91,
-	SDLK_BACKSLASH		= 92,
-	SDLK_RIGHTBRACKET	= 93,
-	SDLK_CARET		= 94,
-	SDLK_UNDERSCORE		= 95,
-	SDLK_BACKQUOTE		= 96,
-	SDLK_a			= 97,
-	SDLK_b			= 98,
-	SDLK_c			= 99,
-	SDLK_d			= 100,
-	SDLK_e			= 101,
-	SDLK_f			= 102,
-	SDLK_g			= 103,
-	SDLK_h			= 104,
-	SDLK_i			= 105,
-	SDLK_j			= 106,
-	SDLK_k			= 107,
-	SDLK_l			= 108,
-	SDLK_m			= 109,
-	SDLK_n			= 110,
-	SDLK_o			= 111,
-	SDLK_p			= 112,
-	SDLK_q			= 113,
-	SDLK_r			= 114,
-	SDLK_s			= 115,
-	SDLK_t			= 116,
-	SDLK_u			= 117,
-	SDLK_v			= 118,
-	SDLK_w			= 119,
-	SDLK_x			= 120,
-	SDLK_y			= 121,
-	SDLK_z			= 122,
-	SDLK_DELETE		= 127,
-	/* End of ASCII mapped keysyms */
+
+typedef enum
+{
+    /* The keyboard syms have been cleverly chosen to map to ASCII */
+    SDLK_UNKNOWN = 0,
+    SDLK_FIRST = 0,
+    SDLK_BACKSPACE = 8,
+    SDLK_TAB = 9,
+    SDLK_CLEAR = 12,
+    SDLK_RETURN = 13,
+    SDLK_PAUSE = 19,
+    SDLK_ESCAPE = 27,
+    SDLK_SPACE = 32,
+    SDLK_EXCLAIM = 33,
+    SDLK_QUOTEDBL = 34,
+    SDLK_HASH = 35,
+    SDLK_DOLLAR = 36,
+    SDLK_AMPERSAND = 38,
+    SDLK_QUOTE = 39,
+    SDLK_LEFTPAREN = 40,
+    SDLK_RIGHTPAREN = 41,
+    SDLK_ASTERISK = 42,
+    SDLK_PLUS = 43,
+    SDLK_COMMA = 44,
+    SDLK_MINUS = 45,
+    SDLK_PERIOD = 46,
+    SDLK_SLASH = 47,
+    SDLK_0 = 48,
+    SDLK_1 = 49,
+    SDLK_2 = 50,
+    SDLK_3 = 51,
+    SDLK_4 = 52,
+    SDLK_5 = 53,
+    SDLK_6 = 54,
+    SDLK_7 = 55,
+    SDLK_8 = 56,
+    SDLK_9 = 57,
+    SDLK_COLON = 58,
+    SDLK_SEMICOLON = 59,
+    SDLK_LESS = 60,
+    SDLK_EQUALS = 61,
+    SDLK_GREATER = 62,
+    SDLK_QUESTION = 63,
+    SDLK_AT = 64,
+    /* 
+       Skip uppercase letters
+     */
+    SDLK_LEFTBRACKET = 91,
+    SDLK_BACKSLASH = 92,
+    SDLK_RIGHTBRACKET = 93,
+    SDLK_CARET = 94,
+    SDLK_UNDERSCORE = 95,
+    SDLK_BACKQUOTE = 96,
+    SDLK_a = 97,
+    SDLK_b = 98,
+    SDLK_c = 99,
+    SDLK_d = 100,
+    SDLK_e = 101,
+    SDLK_f = 102,
+    SDLK_g = 103,
+    SDLK_h = 104,
+    SDLK_i = 105,
+    SDLK_j = 106,
+    SDLK_k = 107,
+    SDLK_l = 108,
+    SDLK_m = 109,
+    SDLK_n = 110,
+    SDLK_o = 111,
+    SDLK_p = 112,
+    SDLK_q = 113,
+    SDLK_r = 114,
+    SDLK_s = 115,
+    SDLK_t = 116,
+    SDLK_u = 117,
+    SDLK_v = 118,
+    SDLK_w = 119,
+    SDLK_x = 120,
+    SDLK_y = 121,
+    SDLK_z = 122,
+    SDLK_DELETE = 127,
+    /* End of ASCII mapped keysyms */
 
-	/* International keyboard syms */
-	SDLK_WORLD_0		= 160,		/* 0xA0 */
-	SDLK_WORLD_1		= 161,
-	SDLK_WORLD_2		= 162,
-	SDLK_WORLD_3		= 163,
-	SDLK_WORLD_4		= 164,
-	SDLK_WORLD_5		= 165,
-	SDLK_WORLD_6		= 166,
-	SDLK_WORLD_7		= 167,
-	SDLK_WORLD_8		= 168,
-	SDLK_WORLD_9		= 169,
-	SDLK_WORLD_10		= 170,
-	SDLK_WORLD_11		= 171,
-	SDLK_WORLD_12		= 172,
-	SDLK_WORLD_13		= 173,
-	SDLK_WORLD_14		= 174,
-	SDLK_WORLD_15		= 175,
-	SDLK_WORLD_16		= 176,
-	SDLK_WORLD_17		= 177,
-	SDLK_WORLD_18		= 178,
-	SDLK_WORLD_19		= 179,
-	SDLK_WORLD_20		= 180,
-	SDLK_WORLD_21		= 181,
-	SDLK_WORLD_22		= 182,
-	SDLK_WORLD_23		= 183,
-	SDLK_WORLD_24		= 184,
-	SDLK_WORLD_25		= 185,
-	SDLK_WORLD_26		= 186,
-	SDLK_WORLD_27		= 187,
-	SDLK_WORLD_28		= 188,
-	SDLK_WORLD_29		= 189,
-	SDLK_WORLD_30		= 190,
-	SDLK_WORLD_31		= 191,
-	SDLK_WORLD_32		= 192,
-	SDLK_WORLD_33		= 193,
-	SDLK_WORLD_34		= 194,
-	SDLK_WORLD_35		= 195,
-	SDLK_WORLD_36		= 196,
-	SDLK_WORLD_37		= 197,
-	SDLK_WORLD_38		= 198,
-	SDLK_WORLD_39		= 199,
-	SDLK_WORLD_40		= 200,
-	SDLK_WORLD_41		= 201,
-	SDLK_WORLD_42		= 202,
-	SDLK_WORLD_43		= 203,
-	SDLK_WORLD_44		= 204,
-	SDLK_WORLD_45		= 205,
-	SDLK_WORLD_46		= 206,
-	SDLK_WORLD_47		= 207,
-	SDLK_WORLD_48		= 208,
-	SDLK_WORLD_49		= 209,
-	SDLK_WORLD_50		= 210,
-	SDLK_WORLD_51		= 211,
-	SDLK_WORLD_52		= 212,
-	SDLK_WORLD_53		= 213,
-	SDLK_WORLD_54		= 214,
-	SDLK_WORLD_55		= 215,
-	SDLK_WORLD_56		= 216,
-	SDLK_WORLD_57		= 217,
-	SDLK_WORLD_58		= 218,
-	SDLK_WORLD_59		= 219,
-	SDLK_WORLD_60		= 220,
-	SDLK_WORLD_61		= 221,
-	SDLK_WORLD_62		= 222,
-	SDLK_WORLD_63		= 223,
-	SDLK_WORLD_64		= 224,
-	SDLK_WORLD_65		= 225,
-	SDLK_WORLD_66		= 226,
-	SDLK_WORLD_67		= 227,
-	SDLK_WORLD_68		= 228,
-	SDLK_WORLD_69		= 229,
-	SDLK_WORLD_70		= 230,
-	SDLK_WORLD_71		= 231,
-	SDLK_WORLD_72		= 232,
-	SDLK_WORLD_73		= 233,
-	SDLK_WORLD_74		= 234,
-	SDLK_WORLD_75		= 235,
-	SDLK_WORLD_76		= 236,
-	SDLK_WORLD_77		= 237,
-	SDLK_WORLD_78		= 238,
-	SDLK_WORLD_79		= 239,
-	SDLK_WORLD_80		= 240,
-	SDLK_WORLD_81		= 241,
-	SDLK_WORLD_82		= 242,
-	SDLK_WORLD_83		= 243,
-	SDLK_WORLD_84		= 244,
-	SDLK_WORLD_85		= 245,
-	SDLK_WORLD_86		= 246,
-	SDLK_WORLD_87		= 247,
-	SDLK_WORLD_88		= 248,
-	SDLK_WORLD_89		= 249,
-	SDLK_WORLD_90		= 250,
-	SDLK_WORLD_91		= 251,
-	SDLK_WORLD_92		= 252,
-	SDLK_WORLD_93		= 253,
-	SDLK_WORLD_94		= 254,
-	SDLK_WORLD_95		= 255,		/* 0xFF */
+    /* International keyboard syms */
+    SDLK_WORLD_0 = 160,         /* 0xA0 */
+    SDLK_WORLD_1 = 161,
+    SDLK_WORLD_2 = 162,
+    SDLK_WORLD_3 = 163,
+    SDLK_WORLD_4 = 164,
+    SDLK_WORLD_5 = 165,
+    SDLK_WORLD_6 = 166,
+    SDLK_WORLD_7 = 167,
+    SDLK_WORLD_8 = 168,
+    SDLK_WORLD_9 = 169,
+    SDLK_WORLD_10 = 170,
+    SDLK_WORLD_11 = 171,
+    SDLK_WORLD_12 = 172,
+    SDLK_WORLD_13 = 173,
+    SDLK_WORLD_14 = 174,
+    SDLK_WORLD_15 = 175,
+    SDLK_WORLD_16 = 176,
+    SDLK_WORLD_17 = 177,
+    SDLK_WORLD_18 = 178,
+    SDLK_WORLD_19 = 179,
+    SDLK_WORLD_20 = 180,
+    SDLK_WORLD_21 = 181,
+    SDLK_WORLD_22 = 182,
+    SDLK_WORLD_23 = 183,
+    SDLK_WORLD_24 = 184,
+    SDLK_WORLD_25 = 185,
+    SDLK_WORLD_26 = 186,
+    SDLK_WORLD_27 = 187,
+    SDLK_WORLD_28 = 188,
+    SDLK_WORLD_29 = 189,
+    SDLK_WORLD_30 = 190,
+    SDLK_WORLD_31 = 191,
+    SDLK_WORLD_32 = 192,
+    SDLK_WORLD_33 = 193,
+    SDLK_WORLD_34 = 194,
+    SDLK_WORLD_35 = 195,
+    SDLK_WORLD_36 = 196,
+    SDLK_WORLD_37 = 197,
+    SDLK_WORLD_38 = 198,
+    SDLK_WORLD_39 = 199,
+    SDLK_WORLD_40 = 200,
+    SDLK_WORLD_41 = 201,
+    SDLK_WORLD_42 = 202,
+    SDLK_WORLD_43 = 203,
+    SDLK_WORLD_44 = 204,
+    SDLK_WORLD_45 = 205,
+    SDLK_WORLD_46 = 206,
+    SDLK_WORLD_47 = 207,
+    SDLK_WORLD_48 = 208,
+    SDLK_WORLD_49 = 209,
+    SDLK_WORLD_50 = 210,
+    SDLK_WORLD_51 = 211,
+    SDLK_WORLD_52 = 212,
+    SDLK_WORLD_53 = 213,
+    SDLK_WORLD_54 = 214,
+    SDLK_WORLD_55 = 215,
+    SDLK_WORLD_56 = 216,
+    SDLK_WORLD_57 = 217,
+    SDLK_WORLD_58 = 218,
+    SDLK_WORLD_59 = 219,
+    SDLK_WORLD_60 = 220,
+    SDLK_WORLD_61 = 221,
+    SDLK_WORLD_62 = 222,
+    SDLK_WORLD_63 = 223,
+    SDLK_WORLD_64 = 224,
+    SDLK_WORLD_65 = 225,
+    SDLK_WORLD_66 = 226,
+    SDLK_WORLD_67 = 227,
+    SDLK_WORLD_68 = 228,
+    SDLK_WORLD_69 = 229,
+    SDLK_WORLD_70 = 230,
+    SDLK_WORLD_71 = 231,
+    SDLK_WORLD_72 = 232,
+    SDLK_WORLD_73 = 233,
+    SDLK_WORLD_74 = 234,
+    SDLK_WORLD_75 = 235,
+    SDLK_WORLD_76 = 236,
+    SDLK_WORLD_77 = 237,
+    SDLK_WORLD_78 = 238,
+    SDLK_WORLD_79 = 239,
+    SDLK_WORLD_80 = 240,
+    SDLK_WORLD_81 = 241,
+    SDLK_WORLD_82 = 242,
+    SDLK_WORLD_83 = 243,
+    SDLK_WORLD_84 = 244,
+    SDLK_WORLD_85 = 245,
+    SDLK_WORLD_86 = 246,
+    SDLK_WORLD_87 = 247,
+    SDLK_WORLD_88 = 248,
+    SDLK_WORLD_89 = 249,
+    SDLK_WORLD_90 = 250,
+    SDLK_WORLD_91 = 251,
+    SDLK_WORLD_92 = 252,
+    SDLK_WORLD_93 = 253,
+    SDLK_WORLD_94 = 254,
+    SDLK_WORLD_95 = 255,        /* 0xFF */
 
-	/* Numeric keypad */
-	SDLK_KP0		= 256,
-	SDLK_KP1		= 257,
-	SDLK_KP2		= 258,
-	SDLK_KP3		= 259,
-	SDLK_KP4		= 260,
-	SDLK_KP5		= 261,
-	SDLK_KP6		= 262,
-	SDLK_KP7		= 263,
-	SDLK_KP8		= 264,
-	SDLK_KP9		= 265,
-	SDLK_KP_PERIOD		= 266,
-	SDLK_KP_DIVIDE		= 267,
-	SDLK_KP_MULTIPLY	= 268,
-	SDLK_KP_MINUS		= 269,
-	SDLK_KP_PLUS		= 270,
-	SDLK_KP_ENTER		= 271,
-	SDLK_KP_EQUALS		= 272,
+    /* Numeric keypad */
+    SDLK_KP0 = 256,
+    SDLK_KP1 = 257,
+    SDLK_KP2 = 258,
+    SDLK_KP3 = 259,
+    SDLK_KP4 = 260,
+    SDLK_KP5 = 261,
+    SDLK_KP6 = 262,
+    SDLK_KP7 = 263,
+    SDLK_KP8 = 264,
+    SDLK_KP9 = 265,
+    SDLK_KP_PERIOD = 266,
+    SDLK_KP_DIVIDE = 267,
+    SDLK_KP_MULTIPLY = 268,
+    SDLK_KP_MINUS = 269,
+    SDLK_KP_PLUS = 270,
+    SDLK_KP_ENTER = 271,
+    SDLK_KP_EQUALS = 272,
 
-	/* Arrows + Home/End pad */
-	SDLK_UP			= 273,
-	SDLK_DOWN		= 274,
-	SDLK_RIGHT		= 275,
-	SDLK_LEFT		= 276,
-	SDLK_INSERT		= 277,
-	SDLK_HOME		= 278,
-	SDLK_END		= 279,
-	SDLK_PAGEUP		= 280,
-	SDLK_PAGEDOWN		= 281,
+    /* Arrows + Home/End pad */
+    SDLK_UP = 273,
+    SDLK_DOWN = 274,
+    SDLK_RIGHT = 275,
+    SDLK_LEFT = 276,
+    SDLK_INSERT = 277,
+    SDLK_HOME = 278,
+    SDLK_END = 279,
+    SDLK_PAGEUP = 280,
+    SDLK_PAGEDOWN = 281,
 
-	/* Function keys */
-	SDLK_F1			= 282,
-	SDLK_F2			= 283,
-	SDLK_F3			= 284,
-	SDLK_F4			= 285,
-	SDLK_F5			= 286,
-	SDLK_F6			= 287,
-	SDLK_F7			= 288,
-	SDLK_F8			= 289,
-	SDLK_F9			= 290,
-	SDLK_F10		= 291,
-	SDLK_F11		= 292,
-	SDLK_F12		= 293,
-	SDLK_F13		= 294,
-	SDLK_F14		= 295,
-	SDLK_F15		= 296,
+    /* Function keys */
+    SDLK_F1 = 282,
+    SDLK_F2 = 283,
+    SDLK_F3 = 284,
+    SDLK_F4 = 285,
+    SDLK_F5 = 286,
+    SDLK_F6 = 287,
+    SDLK_F7 = 288,
+    SDLK_F8 = 289,
+    SDLK_F9 = 290,
+    SDLK_F10 = 291,
+    SDLK_F11 = 292,
+    SDLK_F12 = 293,
+    SDLK_F13 = 294,
+    SDLK_F14 = 295,
+    SDLK_F15 = 296,
 
-	/* Key state modifier keys */
-	SDLK_NUMLOCK		= 300,
-	SDLK_CAPSLOCK		= 301,
-	SDLK_SCROLLOCK		= 302,
-	SDLK_RSHIFT		= 303,
-	SDLK_LSHIFT		= 304,
-	SDLK_RCTRL		= 305,
-	SDLK_LCTRL		= 306,
-	SDLK_RALT		= 307,
-	SDLK_LALT		= 308,
-	SDLK_RMETA		= 309,
-	SDLK_LMETA		= 310,
-	SDLK_LSUPER		= 311,		/* Left "Windows" key */
-	SDLK_RSUPER		= 312,		/* Right "Windows" key */
-	SDLK_MODE		= 313,		/* "Alt Gr" key */
-	SDLK_COMPOSE		= 314,		/* Multi-key compose key */
+    /* Key state modifier keys */
+    SDLK_NUMLOCK = 300,
+    SDLK_CAPSLOCK = 301,
+    SDLK_SCROLLOCK = 302,
+    SDLK_RSHIFT = 303,
+    SDLK_LSHIFT = 304,
+    SDLK_RCTRL = 305,
+    SDLK_LCTRL = 306,
+    SDLK_RALT = 307,
+    SDLK_LALT = 308,
+    SDLK_RMETA = 309,
+    SDLK_LMETA = 310,
+    SDLK_LSUPER = 311,          /* Left "Windows" key */
+    SDLK_RSUPER = 312,          /* Right "Windows" key */
+    SDLK_MODE = 313,            /* "Alt Gr" key */
+    SDLK_COMPOSE = 314,         /* Multi-key compose key */
 
-	/* Miscellaneous function keys */
-	SDLK_HELP		= 315,
-	SDLK_PRINT		= 316,
-	SDLK_SYSREQ		= 317,
-	SDLK_BREAK		= 318,
-	SDLK_MENU		= 319,
-	SDLK_POWER		= 320,		/* Power Macintosh power key */
-	SDLK_EURO		= 321,		/* Some european keyboards */
-	SDLK_UNDO		= 322,		/* Atari keyboard has Undo */
+    /* Miscellaneous function keys */
+    SDLK_HELP = 315,
+    SDLK_PRINT = 316,
+    SDLK_SYSREQ = 317,
+    SDLK_BREAK = 318,
+    SDLK_MENU = 319,
+    SDLK_POWER = 320,           /* Power Macintosh power key */
+    SDLK_EURO = 321,            /* Some european keyboards */
+    SDLK_UNDO = 322,            /* Atari keyboard has Undo */
 
-	/* Add any other keys here */
+    /* Add any other keys here */
 
-	SDLK_LAST
+    SDLK_LAST
 } SDLKey;
 
 /* Enumeration of valid key mods (possibly OR'd together) */
-typedef enum {
-	KMOD_NONE  = 0x0000,
-	KMOD_LSHIFT= 0x0001,
-	KMOD_RSHIFT= 0x0002,
-	KMOD_LCTRL = 0x0040,
-	KMOD_RCTRL = 0x0080,
-	KMOD_LALT  = 0x0100,
-	KMOD_RALT  = 0x0200,
-	KMOD_LMETA = 0x0400,
-	KMOD_RMETA = 0x0800,
-	KMOD_NUM   = 0x1000,
-	KMOD_CAPS  = 0x2000,
-	KMOD_MODE  = 0x4000,
-	KMOD_RESERVED = 0x8000
+typedef enum
+{
+    KMOD_NONE = 0x0000,
+    KMOD_LSHIFT = 0x0001,
+    KMOD_RSHIFT = 0x0002,
+    KMOD_LCTRL = 0x0040,
+    KMOD_RCTRL = 0x0080,
+    KMOD_LALT = 0x0100,
+    KMOD_RALT = 0x0200,
+    KMOD_LMETA = 0x0400,
+    KMOD_RMETA = 0x0800,
+    KMOD_NUM = 0x1000,
+    KMOD_CAPS = 0x2000,
+    KMOD_MODE = 0x4000,
+    KMOD_RESERVED = 0x8000
 } SDLMod;
 
 #define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
--- a/include/SDL_loadso.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_loadso.h	Sun May 28 13:04:16 2006 +0000
@@ -20,23 +20,24 @@
     slouken@libsdl.org
 */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* System dependent library loading routines                           */
-
-/* Some things to keep in mind:                                        
-   - These functions only work on C function names.  Other languages may
-     have name mangling and intrinsic language support that varies from
-     compiler to compiler.
-   - Make sure you declare your function pointers with the same calling
-     convention as the actual library function.  Your code will crash
-     mysteriously if you do not do this.
-   - Avoid namespace collisions.  If you load a symbol from the library,
-     it is not defined whether or not it goes into the global symbol
-     namespace for the application.  If it does and it conflicts with
-     symbols in your code or other shared libraries, you will not get
-     the results you expect. :)
-*/
-
+/**
+ * \file SDL_loadso.h
+ *
+ * System dependent library loading routines
+ *
+ * Some things to keep in mind:                                        
+ * - These functions only work on C function names.  Other languages may
+ *   have name mangling and intrinsic language support that varies from
+ *   compiler to compiler.
+ * - Make sure you declare your function pointers with the same calling
+ *   convention as the actual library function.  Your code will crash
+ *   mysteriously if you do not do this.
+ * - Avoid namespace collisions.  If you load a symbol from the library,
+ *   it is not defined whether or not it goes into the global symbol
+ *   namespace for the application.  If it does and it conflicts with
+ *   symbols in your code or other shared libraries, you will not get
+ *   the results you expect. :)
+ */
 
 #ifndef _SDL_loadso_h
 #define _SDL_loadso_h
@@ -47,28 +48,35 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* This function dynamically loads a shared object and returns a pointer
  * to the object handle (or NULL if there was an error).
  * The 'sofile' parameter is a system dependent name of the object file.
  */
-extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
+extern DECLSPEC void *SDLCALL SDL_LoadObject (const char *sofile);
 
 /* Given an object handle, this function looks up the address of the
  * named function in the shared object and returns it.  This address
  * is no longer valid after calling SDL_UnloadObject().
  */
-extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
+extern DECLSPEC void *SDLCALL SDL_LoadFunction (void *handle,
+                                                const char *name);
 
 /* Unload a shared object from memory */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
+extern DECLSPEC void SDLCALL SDL_UnloadObject (void *handle);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_loadso_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_main.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_main.h	Sun May 28 13:04:16 2006 +0000
@@ -50,7 +50,7 @@
 #define main	SDL_main
 
 /* The prototype for the application's main() function */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
+extern C_LINKAGE int SDL_main (int argc, char *argv[]);
 
 
 /* From the SDL library code -- needed for registering the app on Win32 */
@@ -58,17 +58,22 @@
 
 #include "begin_code.h"
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* This should be called from your WinMain() function, if any */
-extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst);
+extern DECLSPEC void SDLCALL SDL_SetModuleHandle (void *hInst);
 /* This can also be called, but is no longer necessary */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
+extern DECLSPEC int SDLCALL SDL_RegisterApp (char *name, Uint32 style,
+                                             void *hInst);
 /* This can also be called, but is no longer necessary (SDL_Quit calls it) */
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
+extern DECLSPEC void SDLCALL SDL_UnregisterApp (void);
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 #endif
@@ -78,17 +83,21 @@
 
 #include "begin_code.h"
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* Forward declaration so we don't need to include QuickDraw.h */
 struct QDGlobals;
 
 /* This should be called from your main() function, if any */
-extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
+extern DECLSPEC void SDLCALL SDL_InitQuickDraw (struct QDGlobals *the_qd);
 
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 #endif
@@ -96,3 +105,5 @@
 #endif /* Need to redefine main()? */
 
 #endif /* _SDL_main_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_mouse.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_mouse.h	Sun May 28 13:04:16 2006 +0000
@@ -20,7 +20,11 @@
     slouken@libsdl.org
 */
 
-/* Include file for SDL mouse event handling */
+/**
+ * \file SDL_mouse.h
+ *
+ * Include file for SDL mouse event handling
+ */
 
 #ifndef _SDL_mouse_h
 #define _SDL_mouse_h
@@ -32,17 +36,20 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
-typedef struct WMcursor WMcursor;	/* Implementation dependent */
-typedef struct SDL_Cursor {
-	SDL_Rect area;			/* The area of the mouse cursor */
-	Sint16 hot_x, hot_y;		/* The "tip" of the cursor */
-	Uint8 *data;			/* B/W cursor data */
-	Uint8 *mask;			/* B/W cursor mask */
-	Uint8 *save[2];			/* Place to save cursor area */
-	WMcursor *wm_cursor;		/* Window-manager cursor */
+typedef struct WMcursor WMcursor;       /* Implementation dependent */
+typedef struct SDL_Cursor
+{
+    SDL_Rect area;              /* The area of the mouse cursor */
+    Sint16 hot_x, hot_y;        /* The "tip" of the cursor */
+    Uint8 *data;                /* B/W cursor data */
+    Uint8 *mask;                /* B/W cursor mask */
+    Uint8 *save[2];             /* Place to save cursor area */
+    WMcursor *wm_cursor;        /* Window-manager cursor */
 } SDL_Cursor;
 
 /* Function prototypes */
@@ -52,7 +59,7 @@
  * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
  * current mouse cursor position.  You can pass NULL for either x or y.
  */
-extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);
+extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState (int *x, int *y);
 
 /*
  * Retrieve the current state of the mouse.
@@ -60,12 +67,12 @@
  * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
  * mouse deltas since the last call to SDL_GetRelativeMouseState().
  */
-extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
+extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState (int *x, int *y);
 
 /*
  * Set the position of the mouse cursor (generates a mouse motion event)
  */
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
+extern DECLSPEC void SDLCALL SDL_WarpMouse (Uint16 x, Uint16 y);
 
 /*
  * Create a cursor using the specified data and mask (in MSB format).
@@ -80,25 +87,25 @@
  *
  * Cursors created with this function must be freed with SDL_FreeCursor().
  */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_CreateCursor
-		(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor
+    (Uint8 * data, Uint8 * mask, int w, int h, int hot_x, int hot_y);
 
 /*
  * Set the currently active cursor to the specified one.
  * If the cursor is currently visible, the change will be immediately 
  * represented on the display.
  */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor *cursor);
+extern DECLSPEC void SDLCALL SDL_SetCursor (SDL_Cursor * cursor);
 
 /*
  * Returns the currently active cursor.
  */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_GetCursor(void);
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor (void);
 
 /*
  * Deallocates a cursor created with SDL_CreateCursor().
  */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor *cursor);
+extern DECLSPEC void SDLCALL SDL_FreeCursor (SDL_Cursor * cursor);
 
 /*
  * Toggle whether or not the cursor is shown on the screen.
@@ -107,7 +114,7 @@
  * before the call, or 0 if it was not.  You can query the current
  * state by passing a 'toggle' value of -1.
  */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
+extern DECLSPEC int SDLCALL SDL_ShowCursor (int toggle);
 
 /* Used as a mask when testing buttons in buttonstate
    Button 1:	Left mouse button
@@ -129,8 +136,12 @@
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_mutex.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_mutex.h	Sun May 28 13:04:16 2006 +0000
@@ -23,10 +23,11 @@
 #ifndef _SDL_mutex_h
 #define _SDL_mutex_h
 
-/* Functions to provide thread synchronization primitives
-
-	These are independent of the other SDL routines.
-*/
+/**
+ * \file SDL_mutex.h
+ *
+ * Functions to provide thread synchronization primitives
+ */
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
@@ -34,7 +35,9 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 extern "C" {
+/* *INDENT-ON* */
 #endif
 
 /* Synchronization functions which can time out return this value
@@ -55,21 +58,21 @@
 typedef struct SDL_mutex SDL_mutex;
 
 /* Create a mutex, initialized unlocked */
-extern DECLSPEC SDL_mutex * SDLCALL SDL_CreateMutex(void);
+extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex (void);
 
 /* Lock the mutex  (Returns 0, or -1 on error) */
 #define SDL_LockMutex(m)	SDL_mutexP(m)
-extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex *mutex);
+extern DECLSPEC int SDLCALL SDL_mutexP (SDL_mutex * mutex);
 
 /* Unlock the mutex  (Returns 0, or -1 on error)
    It is an error to unlock a mutex that has not been locked by
    the current thread, and doing so results in undefined behavior.
  */
 #define SDL_UnlockMutex(m)	SDL_mutexV(m)
-extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex *mutex);
+extern DECLSPEC int SDLCALL SDL_mutexV (SDL_mutex * mutex);
 
 /* Destroy a mutex */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
+extern DECLSPEC void SDLCALL SDL_DestroyMutex (SDL_mutex * mutex);
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -81,21 +84,21 @@
 typedef struct SDL_semaphore SDL_sem;
 
 /* Create a semaphore, initialized with value, returns NULL on failure. */
-extern DECLSPEC SDL_sem * SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
+extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore (Uint32 initial_value);
 
 /* Destroy a semaphore */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem *sem);
+extern DECLSPEC void SDLCALL SDL_DestroySemaphore (SDL_sem * sem);
 
 /* This function suspends the calling thread until the semaphore pointed 
  * to by sem has a positive count. It then atomically decreases the semaphore
  * count.
  */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem *sem);
+extern DECLSPEC int SDLCALL SDL_SemWait (SDL_sem * sem);
 
 /* Non-blocking variant of SDL_SemWait(), returns 0 if the wait succeeds,
    SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
 */
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem *sem);
+extern DECLSPEC int SDLCALL SDL_SemTryWait (SDL_sem * sem);
 
 /* Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
    the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
@@ -103,15 +106,15 @@
    On some platforms this function is implemented by looping with a delay
    of 1 ms, and so should be avoided if possible.
 */
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms);
+extern DECLSPEC int SDLCALL SDL_SemWaitTimeout (SDL_sem * sem, Uint32 ms);
 
 /* Atomically increases the semaphore's count (not blocking), returns 0,
    or -1 on error.
  */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem *sem);
+extern DECLSPEC int SDLCALL SDL_SemPost (SDL_sem * sem);
 
 /* Returns the current count of the semaphore */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem *sem);
+extern DECLSPEC Uint32 SDLCALL SDL_SemValue (SDL_sem * sem);
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -123,27 +126,27 @@
 typedef struct SDL_cond SDL_cond;
 
 /* Create a condition variable */
-extern DECLSPEC SDL_cond * SDLCALL SDL_CreateCond(void);
+extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond (void);
 
 /* Destroy a condition variable */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond *cond);
+extern DECLSPEC void SDLCALL SDL_DestroyCond (SDL_cond * cond);
 
 /* Restart one of the threads that are waiting on the condition variable,
    returns 0 or -1 on error.
  */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond *cond);
+extern DECLSPEC int SDLCALL SDL_CondSignal (SDL_cond * cond);
 
 /* Restart all threads that are waiting on the condition variable,
    returns 0 or -1 on error.
  */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond *cond);
+extern DECLSPEC int SDLCALL SDL_CondBroadcast (SDL_cond * cond);
 
 /* Wait on the condition variable, unlocking the provided mutex.
    The mutex must be locked before entering this function!
    The mutex is re-locked once the condition variable is signaled.
    Returns 0 when it is signaled, or -1 on error.
  */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
+extern DECLSPEC int SDLCALL SDL_CondWait (SDL_cond * cond, SDL_mutex * mut);
 
 /* Waits for at most 'ms' milliseconds, and returns 0 if the condition
    variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
@@ -151,12 +154,18 @@
    On some platforms this function is implemented by looping with a delay
    of 1 ms, and so should be avoided if possible.
 */
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);
+extern DECLSPEC int SDLCALL SDL_CondWaitTimeout (SDL_cond * cond,
+                                                 SDL_mutex * mutex,
+                                                 Uint32 ms);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
+/* *INDENT-OFF* */
 }
+/* *INDENT-ON* */
 #endif
 #include "close_code.h"
 
 #endif /* _SDL_mutex_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/include/SDL_opengl.h	Sun May 21 17:27:13 2006 +0000
+++ b/include/SDL_opengl.h	Sun May 28 13:04:16 2006 +0000
@@ -20,29 +20,33 @@
     slouken@libsdl.org
 */
 
-/* This is a simple file to encapsulate the OpenGL API headers */
+/**
+ * \file SDL_opengl.h
+ *
+ * This is a simple file to encapsulate the OpenGL API headers
+ */
 
 #include "SDL_config.h"
 
 #ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
-#define NOMINMAX	/* Don't defined min() and max() */
+#define NOMINMAX                /* Don't defined min() and max() */
 #endif
 #include <windows.h>
 #endif
 #ifndef NO_SDL_GLEXT
-#define __glext_h_  /* Don't let gl.h include glext.h */
+#define __glext_h_              /* Don't let gl.h include glext.h */
 #endif
 #if defined(__MACOSX__)
-#include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
+#include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
+#include <OpenGL/glu.h>         /* Header File For The GLU Library */
 #elif defined(__MACOS__)
-#include <gl.h>		/* Header File For The OpenGL Library */
-#include <glu.h>	/* Header File For The GLU Library */
+#include <gl.h>                 /* Header File For The OpenGL Library */
+#include <glu.h>                /* Header File For The GLU Library */
 #else
-#include <GL/gl.h>	/* Header File For The OpenGL Library */
-#include <GL/glu.h>	/* Header File For The GLU Library */
+#include <GL/gl.h>              /* Header File For The OpenGL Library */
+#include <GL/glu.h>             /* Header File For The GLU Library */
 #endif
 #ifndef NO_SDL_GLEXT
 #undef __glext_h_
@@ -57,7 +61,8 @@
 #define __glext_h_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /*
@@ -3099,642 +3104,1247 @@
 #include <stddef.h>
 #ifndef GL_VERSION_2_0
 /* GL type for program/shader text */
-typedef char GLchar;			/* native character */
+    typedef char GLchar;        /* native character */
 #endif
 
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
+    typedef ptrdiff_t GLintptr;
+    typedef ptrdiff_t GLsizeiptr;
 #endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
+    typedef ptrdiff_t GLintptrARB;
+    typedef ptrdiff_t GLsizeiptrARB;
 #endif
 
 #ifndef GL_ARB_shader_objects
 /* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
+    typedef char GLcharARB;     /* native character */
+    typedef unsigned int GLhandleARB;   /* shader object handle */
 #endif
 
 /* GL types for "half" precision (s10e5) float data in host memory */
 #ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
+    typedef unsigned short GLhalfARB;
 #endif
 
 #ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
+    typedef unsigned short GLhalfNV;
 #endif
 
 #ifndef GL_VERSION_1_2
 #define GL_VERSION_1_2 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+    GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+    GLAPI void APIENTRY glBlendEquation (GLenum);
+    GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei,
+                                             GLenum, const GLvoid *);
+    GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum,
+                                      const GLvoid *);
+    GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum,
+                                                 const GLfloat *);
+    GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum,
+                                                 const GLint *);
+    GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint,
+                                          GLsizei);
+    GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+    GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum,
+                                                    GLfloat *);
+    GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum,
+                                         GLenum, const GLvoid *);
+    GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint,
+                                             GLsizei);
+    GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei,
+                                               GLenum, GLenum,
+                                               const GLvoid *);
+    GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei,
+                                               GLsizei, GLenum, GLenum,
+                                               const GLvoid *);
+    GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+    GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum,
+                                                  const GLfloat *);
+    GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+    GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum,
+                                                  const GLint *);
+    GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint,
+                                                   GLint, GLsizei);
+    GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint,
+                                                   GLint, GLsizei, GLsizei);
+    GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum,
+                                                GLvoid *);
+    GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum,
+                                                     GLfloat *);
+    GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum,
+                                              GLvoid *, GLvoid *, GLvoid *);
+    GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei,
+                                             GLenum, GLenum, const GLvoid *,
+                                             const GLvoid *);
+    GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum,
+                                        GLvoid *);
+    GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+    GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum,
+                                     GLvoid *);
+    GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+    GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+    GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+    GLAPI void APIENTRY glResetHistogram (GLenum);
+    GLAPI void APIENTRY glResetMinmax (GLenum);
+    GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei,
+                                      GLsizei, GLint, GLenum, GLenum,
+                                      const GLvoid *);
+    GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint,
+                                         GLsizei, GLsizei, GLsizei, GLenum,
+                                         GLenum, const GLvoid *);
+    GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint,
+                                             GLint, GLint, GLint, GLsizei,
+                                             GLsizei);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red,
+                                                  GLclampf green,
+                                                  GLclampf blue,
+                                                  GLclampf alpha);
+    typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+    typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode,
+                                                         GLuint start,
+                                                         GLuint end,
+                                                         GLsizei count,
+                                                         GLenum type,
+                                                         const GLvoid *
+                                                         indices);
+    typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target,
+                                                  GLenum internalformat,
+                                                  GLsizei width,
+                                                  GLenum format, GLenum type,
+                                                  const GLvoid * table);
+    typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target,
+                                                             GLenum pname,
+                                                             const GLfloat *
+                                                             params);
+    typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target,
+                                                             GLenum pname,
+                                                             const GLint *
+                                                             params);
+    typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target,
+                                                      GLenum internalformat,
+                                                      GLint x, GLint y,
+                                                      GLsizei width);
+    typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target,
+                                                     GLenum format,
+                                                     GLenum type,
+                                                     GLvoid * table);
+    typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target,
+                                                                GLenum pname,
+                                                                GLfloat *
+                                                                params);
+    typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target,
+                                                                GLenum pname,
+                                                                GLint *
+                                                                params);
+    typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target,
+                                                     GLsizei start,
+                                                     GLsizei count,
+                                                     GLenum format,
+                                                     GLenum type,
+                                                     const GLvoid * data);
+    typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target,
+                                                         GLsizei start,
+                                                         GLint x, GLint y,
+                                                         GLsizei width);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target,
+                                                           GLenum
+                                                           internalformat,
+                                                           GLsizei width,
+                                                           GLenum format,
+                                                           GLenum type,
+                                                           const GLvoid *
+                                                           image);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target,
+                                                           GLenum
+                                                           internalformat,
+                                                           GLsizei width,
+                                                           GLsizei height,
+                                                           GLenum format,
+                                                           GLenum type,
+                                                           const GLvoid *
+                                                           image);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target,
+                                                             GLenum pname,
+                                                             GLfloat params);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target,
+                                                              GLenum pname,
+                                                              const GLfloat *
+                                                              params);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target,
+                                                             GLenum pname,
+                                                             GLint params);
+    typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target,
+                                                              GLenum pname,
+                                                              const GLint *
+                                                              params);
+    typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target,
+                                                               GLenum
+                                                               internalformat,
+                                                               GLint x,
+                                                               GLint y,
+                                                               GLsizei width);
+    typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target,
+                                                               GLenum
+                                                               internalformat,
+                                                               GLint x,
+                                                               GLint y,
+                                                               GLsizei width,
+                                                               GLsizei
+                                                               height);
+    typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target,
+                                                            GLenum format,
+                                                            GLenum type,
+                                                            GLvoid * image);
+    typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum
+                                                                 target,
+                                                                 GLenum pname,
+                                                                 GLfloat *
+                                                                 params);
+    typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum
+                                                                 target,
+                                                                 GLenum pname,
+                                                                 GLint *
+                                                                 params);
+    typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target,
+                                                          GLenum format,
+                                                          GLenum type,
+                                                          GLvoid * row,
+                                                          GLvoid * column,
+                                                          GLvoid * span);
+    typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target,
+                                                         GLenum
+                                                         internalformat,
+                                                         GLsizei width,
+                                                         GLsizei height,
+                                                         GLenum format,
+                                                         GLenum type,
+                                                         const GLvoid * row,
+                                                         const GLvoid *
+                                                         column);
+    typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target,
+                                                    GLboolean reset,
+                                                    GLenum format,
+                                                    GLenum type,
+                                                    GLvoid * values);
+    typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target,
+                                                               GLenum pname,
+                                                               GLfloat *
+                                                               params);
+    typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target,
+                                                               GLenum pname,
+                                                               GLint *
+                                                               params);
+    typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target,
+                                                 GLboolean reset,
+                                                 GLenum format, GLenum type,
+                                                 GLvoid * values);
+    typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target,
+                                                            GLenum pname,
+                                                            GLfloat * params);
+    typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target,
+                                                            GLenum pname,
+                                                            GLint * params);
+    typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width,
+                                                 GLenum internalformat,
+                                                 GLboolean sink);
+    typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target,
+                                              GLenum internalformat,
+                                              GLboolean sink);
+    typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+    typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+    typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level,
+                                                  GLint internalformat,
+                                                  GLsizei width,
+                                                  GLsizei height,
+                                                  GLsizei depth, GLint border,
+                                                  GLenum format, GLenum type,
+                                                  const GLvoid * pixels);
+    typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target,
+                                                     GLint level,
+                                                     GLint xoffset,
+                                                     GLint yoffset,
+                                                     GLint zoffset,
+                                                     GLsizei width,
+                                                     GLsizei height,
+                                                     GLsizei depth,
+                                                     GLenum format,
+                                                     GLenum type,
+                                                     const GLvoid * pixels);
+    typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target,
+                                                         GLint level,
+                                                         GLint xoffset,
+                                                         GLint yoffset,
+                                                         GLint zoffset,
+                                                         GLint x, GLint y,
+                                                         GLsizei width,
+                                                         GLsizei height);
 #endif
 
 #ifndef GL_VERSION_1_3
 #define GL_VERSION_1_3 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+    GLAPI void APIENTRY glActiveTexture (GLenum);
+    GLAPI void APIENTRY glClientActiveTexture (GLenum);
+    GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
+    GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
+    GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble,
+                                           GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
+    GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble,
+                                           GLdouble, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat,
+                                           GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint,
+                                           GLint);
+    GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort,
+                                           GLshort);
+    GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
+    GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
+    GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
+    GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
+    GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
+    GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+    GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum,
+                                                GLsizei, GLsizei, GLsizei,
+                                                GLint, GLsizei,
+                                                const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum,
+                                                GLsizei, GLsizei, GLint,
+                                                GLsizei, const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum,
+                                                GLsizei, GLint, GLsizei,
+                                                const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint,
+                                                   GLint, GLint, GLsizei,
+                                                   GLsizei, GLsizei, GLenum,
+                                                   GLsizei, const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint,
+                                                   GLint, GLsizei, GLsizei,
+                                                   GLenum, GLsizei,
+                                                   const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint,
+                                                   GLsizei, GLenum, GLsizei,
+                                                   const GLvoid *);
+    GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+    typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target,
+                                                       GLdouble s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target,
+                                                        const GLdouble * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target,
+                                                       GLfloat s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target,
+                                                        const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target,
+                                                       GLint s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target,
+                                                        const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target,
+                                                       GLshort s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target,
+                                                        const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target,
+                                                       GLdouble s,
+                                                       GLdouble t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target,
+                                                        const GLdouble * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target,
+                                                       GLfloat s, GLfloat t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target,
+                                                        const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s,
+                                                       GLint t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target,
+                                                        const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target,
+                                                       GLshort s, GLshort t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target,
+                                                        const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target,
+                                                       GLdouble s, GLdouble t,
+                                                       GLdouble r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target,
+                                                        const GLdouble * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target,
+                                                       GLfloat s, GLfloat t,
+                                                       GLfloat r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target,
+                                                        const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s,
+                                                       GLint t, GLint r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target,
+                                                        const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target,
+                                                       GLshort s, GLshort t,
+                                                       GLshort r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target,
+                                                        const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target,
+                                                       GLdouble s, GLdouble t,
+                                                       GLdouble r,
+                                                       GLdouble q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target,
+                                                        const GLdouble * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target,
+                                                       GLfloat s, GLfloat t,
+                                                       GLfloat r, GLfloat q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target,
+                                                        const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s,
+                                                       GLint t, GLint r,
+                                                       GLint q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target,
+                                                        const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target,
+                                                       GLshort s, GLshort t,
+                                                       GLshort r, GLshort q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target,
+                                                        const GLshort * v);
+    typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *
+                                                            m);
+    typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *
+                                                            m);
+    typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *
+                                                            m);
+    typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *
+                                                            m);
+    typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value,
+                                                      GLboolean invert);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target,
+                                                            GLint level,
+                                                            GLenum
+                                                            internalformat,
+                                                            GLsizei width,
+                                                            GLsizei height,
+                                                            GLsizei depth,
+                                                            GLint border,
+                                                            GLsizei imageSize,
+                                                            const GLvoid *
+                                                            data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target,
+                                                            GLint level,
+                                                            GLenum
+                                                            internalformat,
+                                                            GLsizei width,
+                                                            GLsizei height,
+                                                            GLint border,
+                                                            GLsizei imageSize,
+                                                            const GLvoid *
+                                                            data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target,
+                                                            GLint level,
+                                                            GLenum
+                                                            internalformat,
+                                                            GLsizei width,
+                                                            GLint border,
+                                                            GLsizei imageSize,
+                                                            const GLvoid *
+                                                            data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLint xoffset,
+                                                               GLint yoffset,
+                                                               GLint zoffset,
+                                                               GLsizei width,
+                                                               GLsizei height,
+                                                               GLsizei depth,
+                                                               GLenum format,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLint xoffset,
+                                                               GLint yoffset,
+                                                               GLsizei width,
+                                                               GLsizei height,
+                                                               GLenum format,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLint xoffset,
+                                                               GLsizei width,
+                                                               GLenum format,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target,
+                                                             GLint level,
+                                                             GLvoid * img);
 #endif
 
 #ifndef GL_VERSION_1_4
 #define GL_VERSION_1_4 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+    GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+    GLAPI void APIENTRY glFogCoordf (GLfloat);
+    GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
+    GLAPI void APIENTRY glFogCoordd (GLdouble);
+    GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
+    GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
+    GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *,
+                                           GLsizei);
+    GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum,
+                                             const GLvoid * *, GLsizei);
+    GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+    GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+    GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+    GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
+    GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
+    GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
+    GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
+    GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
+    GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
+    GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
+    GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
+    GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
+    GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
+    GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
+    GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
+    GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
+    GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
+    GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
+    GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
+    GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei,
+                                                 const GLvoid *);
+    GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
+    GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
+    GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
+    GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
+    GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
+    GLAPI void APIENTRY glWindowPos2iv (const GLint *);
+    GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
+    GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
+    GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
+    GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
+    GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
+    GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
+    GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
+    GLAPI void APIENTRY glWindowPos3iv (const GLint *);
+    GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
+    GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB,
+                                                         GLenum dfactorRGB,
+                                                         GLenum sfactorAlpha,
+                                                         GLenum dfactorAlpha);
+    typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+    typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat * coord);
+    typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+    typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble * coord);
+    typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type,
+                                                       GLsizei stride,
+                                                       const GLvoid *
+                                                       pointer);
+    typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode,
+                                                       GLint * first,
+                                                       GLsizei * count,
+                                                       GLsizei primcount);
+    typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode,
+                                                         const GLsizei *
+                                                         count, GLenum type,
+                                                         const GLvoid *
+                                                         *indices,
+                                                         GLsizei primcount);
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname,
+                                                       GLfloat param);
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname,
+                                                        const GLfloat *
+                                                        params);
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname,
+                                                       GLint param);
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname,
+                                                        const GLint * params);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red,
+                                                        GLbyte green,
+                                                        GLbyte blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red,
+                                                        GLdouble green,
+                                                        GLdouble blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red,
+                                                        GLfloat green,
+                                                        GLfloat blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red,
+                                                        GLint green,
+                                                        GLint blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red,
+                                                        GLshort green,
+                                                        GLshort blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red,
+                                                         GLubyte green,
+                                                         GLubyte blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red,
+                                                         GLuint green,
+                                                         GLuint blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red,
+                                                         GLushort green,
+                                                         GLushort blue);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort * v);
+    typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size,
+                                                             GLenum type,
+                                                             GLsizei stride,
+                                                             const GLvoid *
+                                                             pointer);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+    typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y,
+                                                   GLdouble z);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y,
+                                                   GLfloat z);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint * v);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y,
+                                                   GLshort z);
+    typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort * v);
 #endif
 
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+    GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+    GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+    GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+    GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+    GLAPI void APIENTRY glEndQuery (GLenum);
+    GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+    GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+    GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+    GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+    GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+    GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+    GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *,
+                                      GLenum);
+    GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr,
+                                         const GLvoid *);
+    GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr,
+                                            GLvoid *);
+    GLAPI GLvoid *APIENTRY glMapBuffer (GLenum, GLenum);
+    GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+    GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+    GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid * *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint * ids);
+    typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n,
+                                                     const GLuint * ids);
+    typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+    typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+    typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+    typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname,
+                                                  GLint * params);
+    typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id,
+                                                        GLenum pname,
+                                                        GLint * params);
+    typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id,
+                                                         GLenum pname,
+                                                         GLuint * params);
+    typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target,
+                                                  GLuint buffer);
+    typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n,
+                                                     const GLuint * buffers);
+    typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n,
+                                                  GLuint * buffers);
+    typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+    typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target,
+                                                  GLsizeiptr size,
+                                                  const GLvoid * data,
+                                                  GLenum usage);
+    typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target,
+                                                     GLintptr offset,
+                                                     GLsizeiptr size,
+                                                     const GLvoid * data);
+    typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target,
+                                                        GLintptr offset,
+                                                        GLsizeiptr size,
+                                                        GLvoid * data);
+    typedef GLvoid *(APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target,
+                                                    GLenum access);
+    typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+    typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target,
+                                                            GLenum pname,
+                                                            GLint * params);
+    typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target,
+                                                         GLenum pname,
+                                                         GLvoid * *params);
 #endif
 
 #ifndef GL_VERSION_2_0
 #define GL_VERSION_2_0 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+    GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
+    GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
+    GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
+    GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
+    GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
+    GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
+    GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
+    GLAPI void APIENTRY glCompileShader (GLuint);
+    GLAPI GLuint APIENTRY glCreateProgram (void);
+    GLAPI GLuint APIENTRY glCreateShader (GLenum);
+    GLAPI void APIENTRY glDeleteProgram (GLuint);
+    GLAPI void APIENTRY glDeleteShader (GLuint);
+    GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
+    GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
+    GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
+    GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *,
+                                           GLint *, GLenum *, GLchar *);
+    GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei,
+                                            GLsizei *, GLint *, GLenum *,
+                                            GLchar *);
+    GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *,
+                                              GLuint *);
+    GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
+    GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
+    GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *,
+                                             GLchar *);
+    GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
+    GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *,
+                                            GLchar *);
+    GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *,
+                                           GLchar *);
+    GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
+    GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
+    GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
+    GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
+    GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
+    GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
+    GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum,
+                                                   GLvoid * *);
+    GLAPI GLboolean APIENTRY glIsProgram (GLuint);
+    GLAPI GLboolean APIENTRY glIsShader (GLuint);
+    GLAPI void APIENTRY glLinkProgram (GLuint);
+    GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar * *,
+                                        const GLint *);
+    GLAPI void APIENTRY glUseProgram (GLuint);
+    GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
+    GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
+    GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
+    GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat,
+                                     GLfloat);
+    GLAPI void APIENTRY glUniform1i (GLint, GLint);
+    GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
+    GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
+    GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
+    GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
+    GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
+    GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
+    GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
+    GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
+    GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
+    GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
+    GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
+    GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean,
+                                            const GLfloat *);
+    GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean,
+                                            const GLfloat *);
+    GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean,
+                                            const GLfloat *);
+    GLAPI void APIENTRY glValidateProgram (GLuint);
+    GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
+    GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
+    GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
+    GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
+    GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
+    GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
+    GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
+    GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
+    GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
+    GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
+    GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
+    GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
+    GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble,
+                                          GLdouble);
+    GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
+    GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
+    GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
+    GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
+    GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
+    GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
+    GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
+    GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
+    GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte,
+                                            GLubyte);
+    GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
+    GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
+    GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
+    GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
+    GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble,
+                                          GLdouble, GLdouble);
+    GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
+    GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat,
+                                          GLfloat);
+    GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
+    GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
+    GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort,
+                                          GLshort);
+    GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
+    GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
+    GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
+    GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
+    GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum,
+                                               GLboolean, GLsizei,
+                                               const GLvoid *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB,
+                                                             GLenum
+                                                             modeAlpha);
+    typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n,
+                                                   const GLenum * bufs);
+    typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face,
+                                                         GLenum sfail,
+                                                         GLenum dpfail,
+                                                         GLenum dppass);
+    typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc,
+                                                           GLenum backfunc,
+                                                           GLint ref,
+                                                           GLuint mask);
+    typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face,
+                                                           GLuint mask);
+    typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program,
+                                                    GLuint shader);
+    typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program,
+                                                          GLuint index,
+                                                          const GLchar *
+                                                          name);
+    typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+    typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+    typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+    typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+    typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+    typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program,
+                                                    GLuint shader);
+    typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+    typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+    typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program,
+                                                       GLuint index,
+                                                       GLsizei bufSize,
+                                                       GLsizei * length,
+                                                       GLint * size,
+                                                       GLenum * type,
+                                                       GLchar * name);
+    typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program,
+                                                        GLuint index,
+                                                        GLsizei bufSize,
+                                                        GLsizei * length,
+                                                        GLint * size,
+                                                        GLenum * type,
+                                                        GLchar * name);
+    typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program,
+                                                          GLsizei maxCount,
+                                                          GLsizei * count,
+                                                          GLuint * obj);
+    typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program,
+                                                          const GLchar *
+                                                          name);
+    typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program,
+                                                    GLenum pname,
+                                                    GLint * params);
+    typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program,
+                                                         GLsizei bufSize,
+                                                         GLsizei * length,
+                                                         GLchar * infoLog);
+    typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader,
+                                                   GLenum pname,
+                                                   GLint * params);
+    typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader,
+                                                        GLsizei bufSize,
+                                                        GLsizei * length,
+                                                        GLchar * infoLog);
+    typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader,
+                                                       GLsizei bufSize,
+                                                       GLsizei * length,
+                                                       GLchar * source);
+    typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program,
+                                                           const GLchar *
+                                                           name);
+    typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program,
+                                                    GLint location,
+                                                    GLfloat * params);
+    typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program,
+                                                    GLint location,
+                                                    GLint * params);
+    typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index,
+                                                         GLenum pname,
+                                                         GLdouble * params);
+    typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index,
+                                                         GLenum pname,
+                                                         GLfloat * params);
+    typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index,
+                                                         GLenum pname,
+                                                         GLint * params);
+    typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index,
+                                                               GLenum pname,
+                                                               GLvoid *
+                                                               *pointer);
+    typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+    typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+    typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+    typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader,
+                                                    GLsizei count,
+                                                    const GLchar * *string,
+                                                    const GLint * length);
+    typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+    typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+    typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0,
+                                                 GLfloat v1);
+    typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0,
+                                                 GLfloat v1, GLfloat v2);
+    typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0,
+                                                 GLfloat v1, GLfloat v2,
+                                                 GLfloat v3);
+    typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+    typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0,
+                                                 GLint v1);
+    typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0,
+                                                 GLint v1, GLint v2);
+    typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0,
+                                                 GLint v1, GLint v2,
+                                                 GLint v3);
+    typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLfloat * value);
+    typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLfloat * value);
+    typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLfloat * value);
+    typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLfloat * value);
+    typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLint * value);
+    typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLint * value);
+    typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLint * value);
+    typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location,
+                                                  GLsizei count,
+                                                  const GLint * value);
+    typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location,
+                                                        GLsizei count,
+                                                        GLboolean transpose,
+                                                        const GLfloat *
+                                                        value);
+    typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location,
+                                                        GLsizei count,
+                                                        GLboolean transpose,
+                                                        const GLfloat *
+                                                        value);
+    typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location,
+                                                        GLsizei count,
+                                                        GLboolean transpose,
+                                                        const GLfloat *
+                                                        value);
+    typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index,
+                                                      GLdouble x);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index,
+                                                       const GLdouble * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index,
+                                                      GLfloat x);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index,
+                                                       const GLfloat * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index,
+                                                      GLshort x);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index,
+                                                       const GLshort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index,
+                                                      GLdouble x, GLdouble y);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index,
+                                                       const GLdouble * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x,
+                                                      GLfloat y);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index,
+                                                       const GLfloat * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x,
+                                                      GLshort y);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index,
+                                                       const GLshort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index,
+                                                      GLdouble x, GLdouble y,
+                                                      GLdouble z);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index,
+                                                       const GLdouble * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x,
+                                                      GLfloat y, GLfloat z);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index,
+                                                       const GLfloat * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x,
+                                                      GLshort y, GLshort z);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index,
+                                                       const GLshort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index,
+                                                        const GLbyte * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index,
+                                                        const GLint * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index,
+                                                        const GLshort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index,
+                                                        GLubyte x, GLubyte y,
+                                                        GLubyte z, GLubyte w);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index,
+                                                         const GLubyte * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index,
+                                                         const GLuint * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index,
+                                                         const GLushort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index,
+                                                       const GLbyte * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index,
+                                                      GLdouble x, GLdouble y,
+                                                      GLdouble z, GLdouble w);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index,
+                                                       const GLdouble * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x,
+                                                      GLfloat y, GLfloat z,
+                                                      GLfloat w);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index,
+                                                       const GLfloat * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index,
+                                                       const GLint * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x,
+                                                      GLshort y, GLshort z,
+                                                      GLshort w);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index,
+                                                       const GLshort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index,
+                                                        const GLubyte * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index,
+                                                        const GLuint * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index,
+                                                        const GLushort * v);
+    typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index,
+                                                           GLint size,
+                                                           GLenum type,
+                                                           GLboolean
+                                                           normalized,
+                                                           GLsizei stride,
+                                                           const GLvoid *
+                                                           pointer);
 #endif
 
 #ifndef GL_ARB_multitexture
 #define GL_ARB_multitexture 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+    GLAPI void APIENTRY glActiveTextureARB (GLenum);
+    GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
+    GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+    GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+    GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble,
+                                              GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat,
+                                              GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+    GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort,
+                                              GLshort);
+    GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+    GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble,
+                                              GLdouble, GLdouble);
+    GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+    GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat,
+                                              GLfloat, GLfloat);
+    GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+    GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint,
+                                              GLint);
+    GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+    GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort,
+                                              GLshort, GLshort);
+    GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+    typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target,
+                                                          GLdouble s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target,
+                                                           const GLdouble *
+                                                           v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target,
+                                                          GLfloat s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target,
+                                                           const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target,
+                                                          GLint s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target,
+                                                           const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target,
+                                                          GLshort s);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target,
+                                                           const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target,
+                                                          GLdouble s,
+                                                          GLdouble t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target,
+                                                           const GLdouble *
+                                                           v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target,
+                                                          GLfloat s,
+                                                          GLfloat t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target,
+                                                           const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target,
+                                                          GLint s, GLint t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target,
+                                                           const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target,
+                                                          GLshort s,
+                                                          GLshort t);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target,
+                                                           const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target,
+                                                          GLdouble s,
+                                                          GLdouble t,
+                                                          GLdouble r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target,
+                                                           const GLdouble *
+                                                           v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target,
+                                                          GLfloat s,
+                                                          GLfloat t,
+                                                          GLfloat r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target,
+                                                           const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target,
+                                                          GLint s, GLint t,
+                                                          GLint r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target,
+                                                           const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target,
+                                                          GLshort s,
+                                                          GLshort t,
+                                                          GLshort r);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target,
+                                                           const GLshort * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target,
+                                                          GLdouble s,
+                                                          GLdouble t,
+                                                          GLdouble r,
+                                                          GLdouble q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target,
+                                                           const GLdouble *
+                                                           v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target,
+                                                          GLfloat s,
+                                                          GLfloat t,
+                                                          GLfloat r,
+                                                          GLfloat q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target,
+                                                           const GLfloat * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target,
+                                                          GLint s, GLint t,
+                                                          GLint r, GLint q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target,
+                                                           const GLint * v);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target,
+                                                          GLshort s,
+                                                          GLshort t,
+                                                          GLshort r,
+                                                          GLshort q);
+    typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target,
+                                                           const GLshort * v);
 #endif
 
 #ifndef GL_ARB_transpose_matrix
 #define GL_ARB_transpose_matrix 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+    GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+    GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+    GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+    GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *
+                                                               m);
+    typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble
+                                                               * m);
+    typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *
+                                                               m);
+    typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble
+                                                               * m);
 #endif
 
 #ifndef GL_ARB_multisample
 #define GL_ARB_multisample 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+    GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value,
+                                                         GLboolean invert);
 #endif
 
 #ifndef GL_ARB_texture_env_add
@@ -3748,21 +4358,118 @@
 #ifndef GL_ARB_texture_compression
 #define GL_ARB_texture_compression 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+    GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum,
+                                                   GLsizei, GLsizei, GLsizei,
+                                                   GLint, GLsizei,
+                                                   const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum,
+                                                   GLsizei, GLsizei, GLint,
+                                                   GLsizei, const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum,
+                                                   GLsizei, GLint, GLsizei,
+                                                   const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint,
+                                                      GLint, GLint, GLsizei,
+                                                      GLsizei, GLsizei,
+                                                      GLenum, GLsizei,
+                                                      const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint,
+                                                      GLint, GLsizei, GLsizei,
+                                                      GLenum, GLsizei,
+                                                      const GLvoid *);
+    GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint,
+                                                      GLsizei, GLenum,
+                                                      GLsizei,
+                                                      const GLvoid *);
+    GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLenum
+                                                               internalformat,
+                                                               GLsizei width,
+                                                               GLsizei height,
+                                                               GLsizei depth,
+                                                               GLint border,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLenum
+                                                               internalformat,
+                                                               GLsizei width,
+                                                               GLsizei height,
+                                                               GLint border,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target,
+                                                               GLint level,
+                                                               GLenum
+                                                               internalformat,
+                                                               GLsizei width,
+                                                               GLint border,
+                                                               GLsizei
+                                                               imageSize,
+                                                               const GLvoid *
+                                                               data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum
+                                                                  target,
+                                                                  GLint level,
+                                                                  GLint
+                                                                  xoffset,
+                                                                  GLint
+                                                                  yoffset,
+                                                                  GLint
+                                                                  zoffset,
+                                                                  GLsizei
+                                                                  width,
+                                                                  GLsizei
+                                                                  height,
+                                                                  GLsizei
+                                                                  depth,
+                                                                  GLenum
+                                                                  format,
+                                                                  GLsizei
+                                                                  imageSize,
+                                                                  const GLvoid
+                                                                  * data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum
+                                                                  target,
+                                                                  GLint level,
+                                                                  GLint
+                                                                  xoffset,
+                                                                  GLint
+                                                                  yoffset,
+                                                                  GLsizei
+                                                                  width,
+                                                                  GLsizei
+                                                                  height,
+                                                                  GLenum
+                                                                  format,
+                                                                  GLsizei
+                                                                  imageSize,
+                                                                  const GLvoid
+                                                                  * data);
+    typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum
+                                                                  target,
+                                                                  GLint level,
+                                                                  GLint
+                                                                  xoffset,
+                                                                  GLsizei
+                                                                  width,
+                                                                  GLenum
+                                                                  format,
+                                                                  GLsizei
+                                                                  imageSize,
+                                                                  const GLvoid
+                                                                  * data);
+    typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target,
+                                                                GLint level,
+                                                                GLvoid * img);
 #endif
 
 #ifndef GL_ARB_texture_border_clamp
@@ -3772,53 +4479,80 @@
 #ifndef GL_ARB_point_parameters
 #define GL_ARB_point_parameters 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+    GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
+    GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname,
+                                                          GLfloat param);
+    typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname,
+                                                           const GLfloat *
+                                                           params);
 #endif
 
 #ifndef GL_ARB_vertex_blend
 #define GL_ARB_vertex_blend 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+    GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
+    GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
+    GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
+    GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
+    GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
+    GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
+    GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
+    GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
+    GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei,
+                                            const GLvoid *);
+    GLAPI void APIENTRY glVertexBlendARB (GLint);
+#endif                          /* GL_GLEXT_PROTOTYPES */
+    typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size,
+                                                   const GLbyte * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size,
+                                                   const GLshort * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size,
+                                                   const GLint * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size,
+                                                   const GLfloat * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size,
+                                                   const GLdouble * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size,
+                                                    const GLubyte * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size,
+                                                    const GLushort * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size,
+                                                    const GLuint * weights);
+    typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size,
+                                                        GLenum type,
+                                                        GLsizei stride,
+                                                        const GLvoid *
+                                                        pointer);
+    typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
 #endif
 
 #ifndef GL_ARB_matrix_palette
 #define GL_ARB_matrix_palette 1
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
<