Changeset 21916 for trunk/src/dinput


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/dinput/dinput.def

    r8346 r21916  
    1313
    1414EXPORTS
    15  DirectInputCreateA  = _DirectInputCreateA@16        @1
     15 DirectInputCreateA  = "_DirectInputCreateA@16"      @1
    1616; DirectInputCreateW = _DirectInputCreateW@16       @2
    17  DirectInputCreateEx = _DirectInputCreateEx@20       @3
    18  DllCanUnloadNow     = _DINPUT_DllCanUnloadNow@0     @4
    19  DllGetClassObject   = _DINPUT_DllGetClassObject@12  @5
    20  DllRegisterServer   = _DINPUT_DllRegisterServer@0  @6
    21  DllUnregisterServer = _DINPUT_DllUnregisterServer@0 @7
     17 DirectInputCreateEx = "_DirectInputCreateEx@20"     @3
     18 DllCanUnloadNow     = "_DINPUT_DllCanUnloadNow@0"   @4
     19 DllGetClassObject   = "_DINPUT_DllGetClassObject@12"  @5
     20 DllRegisterServer   = "_DINPUT_DllRegisterServer@0" @6
     21 DllUnregisterServer = "_DINPUT_DllUnregisterServer@0" @7
    2222

  • trunk/src/dinput/dinput_main.c

    r9016 r21916  
    319319
    320320#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
    321 # define XCAST(fun)   (typeof(ddi7avt.fun))
     321# define XCAST(fun)   (typeof(ddi7avt.fn##fun))
    322322#else
    323323# define XCAST(fun)     (void*)
    … …  
    340340
    341341#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
    342 # define XCAST(fun)     (typeof(ddi8avt.fun))
     342# define XCAST(fun)     (typeof(ddi8avt.fn##fun))
    343343#else
    344344# define XCAST(fun)     (void*)
Note: See TracChangeset for help on using the changeset viewer.