summaryrefslogtreecommitdiff
path: root/src/libw32dll/wine/windef.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-21 01:44:17 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-21 01:44:17 +0000
commit4aadaafa08dc0d3b926378581c37b2e2f0492731 (patch)
treee55d8f0e689963677d574d1ac0714dc33d924735 /src/libw32dll/wine/windef.h
parenta3be47db5aea60af614bc11fa1d9d726fabeba19 (diff)
downloadxine-lib-4aadaafa08dc0d3b926378581c37b2e2f0492731.tar.gz
xine-lib-4aadaafa08dc0d3b926378581c37b2e2f0492731.tar.bz2
update win32 codec loading code
- shiny new win32 crap from avifile and mplayer! - shiny new compilation warnings! - use directshow filter to decode msmpeg v1/v2 - disable SYNC_SHUTDOWN ugly hack (will be removed soon, i hope) CVS patchset: 2114 CVS date: 2002/06/21 01:44:17
Diffstat (limited to 'src/libw32dll/wine/windef.h')
-rw-r--r--src/libw32dll/wine/windef.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libw32dll/wine/windef.h b/src/libw32dll/wine/windef.h
index 38b498101..8c1865a6e 100644
--- a/src/libw32dll/wine/windef.h
+++ b/src/libw32dll/wine/windef.h
@@ -105,7 +105,7 @@ extern "C" {
/* Calling conventions definitions */
-#if defined(__i386__) && !defined(WINE_TYPEDEFS_ONLY)
+#ifdef __i386__
# if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
# ifndef _EGCS_
#define __stdcall __attribute__((__stdcall__))
@@ -127,18 +127,24 @@ extern "C" {
#define PASCAL __stdcall
#define pascal __stdcall
#define _pascal __stdcall
+#if !defined(__CYGWIN__)
#define _stdcall __stdcall
+#endif
#define _fastcall __stdcall
#define __fastcall __stdcall
#define __export __stdcall
#define CDECL __cdecl
#define _CDECL __cdecl
#define cdecl __cdecl
+#if !defined(__CYGWIN__)
#define _cdecl __cdecl
+#endif
#define WINAPIV __cdecl
#define APIENTRY WINAPI
+#if !defined(__CYGWIN__)
#define __declspec(x)
+#endif
#define dllimport
#define dllexport