sdl-ios-xcode: src/video/Xext/extensions/panoramiXext.h annotate

annotate src/video/Xext/extensions/panoramiXext.h @ 4426:1bceff8f008f

Fixed bug #943 Ozkan Sezer 2010-02-06 12:31:06 PST Hi: Here are some small fixes for compiling SDL against mingw-w64. (see http://mingw-w64.sourceforge.net/ . Despite the name, it supports both win32 and win64.) src/audio/windx5/directx.h and src/video/windx5/directx.h (both SDL-1.2 and SDL-1.3.) I get compilation errors about some union not having a member named u1 and alike, because of other system headers being included before this one and them already defining DUMMYUNIONNAME and stuff. This header probably assumes that those stuff are defined in windef.h, but mingw-w64 headers define them in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to the top of the file. src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) : The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric because _beginthreadex returns uintptr_t, not unsigned long which is 32 bits in win64. Changing the return type to uintptr_t fixes it. video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64 uses msvcrt version of _aligned_malloc and _aligned_free and they are defined in intrin.h (similar to VC). Adding proper ifdefs fixes it. (Notes about macros to check: __MINGW32__ is defined for both mingw.org and for mingw-w64 for both win32 and win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__ can't be used to detect mingw-w64: including _mingw.h and then checking for __MINGW64_VERSION_MAJOR does the trick.) SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition and location in order to avoid multiple redefinition warnings. Hope these are useful. Thanks.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 10 Mar 2010 15:02:58 +0000
parents	c121d94672cb
children

rev	line source
292 eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 /*****************************************************************
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4 Permission is hereby granted, free of charge, to any person obtaining a copy
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 of this software and associated documentation files (the "Software"), to deal
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 in the Software without restriction, including without limitation the rights
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 copies of the Software.
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 The above copyright notice and this permission notice shall be included in
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 all copies or substantial portions of the Software.
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 Except as contained in this notice, the name of Digital Equipment Corporation
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 shall not be used in advertising or otherwise to promote the sale, use or other
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23 dealings in this Software without prior written authorization from Digital
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 Equipment Corporation.
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 ******************************************************************/
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 /*
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 * PanoramiX definitions
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 */
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 /* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30
293 585a7e1285ae * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 292 diff changeset	31 #include "SDL_name.h"
292 eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 #define PANORAMIX_MAJOR_VERSION 1 /* current version number */
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 #define PANORAMIX_MINOR_VERSION 1
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	38 typedef struct
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	39 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	40 Window window; /* PanoramiX window - may not exist */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	41 int screen;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	42 int State; /* PanroamiXOff, PanoramiXOn */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	43 int width; /* width of this screen */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	44 int height; /* height of this screen */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	45 int ScreenCount; /* real physical number of screens */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	46 XID eventMask; /* selected events for this client */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	47 } SDL_NAME(XPanoramiXInfo);
292 eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	49 extern
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	50 SDL_NAME(XPanoramiXInfo) *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	51 SDL_NAME(XPanoramiXAllocInfo) (
292 eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 #if NeedFunctionPrototypes
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	53 void
292 eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect() Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	55 );
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 293 diff changeset	56 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/Xext/extensions/panoramiXext.h @ 4426:1bceff8f008f