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 edited

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_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.