Mercurial > sdl-ios-xcode

diff src/haptic/win32/SDL_syshaptic.c @ 2717:50bc882455e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of force feedback branch r4039.
author Edgar Simo <bobbens@gmail.com>
date Mon, 25 Aug 2008 17:34:58 +0000
parents 336b604ec15b
children 02aa80d7905f
line wrap: on
line diff
--- a/src/haptic/win32/SDL_syshaptic.c	Mon Aug 25 15:08:59 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Mon Aug 25 17:34:58 2008 +0000
@@ -34,11 +34,11 @@
 
 #define DIRECTINPUT_VERSION 0x0700      /* Need at least DirectX 7 for dwStartDelay */
 #include <dinput.h>
-#include <dxerr.h>
+#include <dxerr8.h>
 #ifdef _MSC_VER
 #  pragma comment (lib, "dinput8.lib")
 #  pragma comment (lib, "dxguid.lib")
-#  pragma comment (lib, "dxerr.lib")
+#  pragma comment (lib, "dxerr8.lib")
 #endif /* _MSC_VER */
 
     /* an ISO hack for VisualC++ */
@@ -123,7 +123,7 @@
 DI_SetError(const char *str, HRESULT err)
 {
     SDL_SetError("Haptic: %s - %s: %s", str,
-                 DXGetErrorString(err), DXGetErrorDescription(err));
+                 DXGetErrorString8A(err), DXGetErrorDescription8A(err));
 }