diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-06-20 11:07:02 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-06-20 11:07:02 +0000 |
| commit | 6076d6ad009bde493847aecd5f054ce77dd2e526 (patch) | |
| tree | 78d48009168d405974881f1eb9f19f64f8029531 | |
| parent | 85db24636adb6223d73395d51762e6923847883a (diff) | |
| download | gst-plugins-bad-6076d6ad009bde493847aecd5f054ce77dd2e526.tar.gz gst-plugins-bad-6076d6ad009bde493847aecd5f054ce77dd2e526.tar.bz2 gst-plugins-bad-6076d6ad009bde493847aecd5f054ce77dd2e526.zip | |
gst/modplug/libmodplug/stdafx.h: Fix modplug on AMD64. Fixes #345336.
Original commit message from CVS:
* gst/modplug/libmodplug/stdafx.h:
Fix modplug on AMD64. Fixes #345336.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/stdafx.h | 17 |
2 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-06-20 Wim Taymans <wim@fluendo.com> + + * gst/modplug/libmodplug/stdafx.h: + Fix modplug on AMD64. Fixes #345336. + 2006-06-19 Tim-Philipp Müller <tim at centricular dot net> * configure.ac: diff --git a/gst/modplug/libmodplug/stdafx.h b/gst/modplug/libmodplug/stdafx.h index 1659f89c..cd2bb5d0 100644 --- a/gst/modplug/libmodplug/stdafx.h +++ b/gst/modplug/libmodplug/stdafx.h @@ -31,25 +31,34 @@ typedef signed char CHAR; typedef unsigned char UCHAR; typedef unsigned char* PUCHAR; typedef unsigned short USHORT; +#if defined(__x86_64__) +typedef unsigned int ULONG; +typedef unsigned int UINT; +typedef unsigned int DWORD; +typedef int LONG; +typedef long LONGLONG; +typedef int * LPLONG; +typedef unsigned int * LPDWORD; +#else typedef unsigned long ULONG; typedef unsigned long UINT; typedef unsigned long DWORD; typedef long LONG; +typedef long long LONGLONG; +typedef long * LPLONG; +typedef unsigned long * LPDWORD; +#endif typedef unsigned short WORD; typedef unsigned char BYTE; typedef unsigned char * LPBYTE; typedef bool BOOL; typedef char * LPSTR; typedef void * LPVOID; -typedef long * LPLONG; -typedef unsigned long * LPDWORD; typedef unsigned short * LPWORD; typedef const char * LPCSTR; -typedef long long LONGLONG; typedef void * PVOID; typedef void VOID; - inline LONG MulDiv (long a, long b, long c) { /* if (!c) return 0; */ |