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/user32/winaccel.cpp

    r10190 r21916  
    1818#include <misc.h>
    1919#include <heapstring.h>
    20 #include <win\winnls.h>
     20#include <win/winnls.h>
    2121
    2222#define DBG_LOCALLOG    DBG_winaccel
    … …  
    2929 * 01:  BYTE    pad             (to WORD boundary)
    3030 * 02:  WORD    event
    31  * 04:  WORD    IDval           
     31 * 04:  WORD    IDval
    3232 * 06:  WORD    pad             (to DWORD boundary)
    3333 */
    … …  
    5454                hRetval = GlobalAlloc(0,sizeof(ACCEL)*nrofaccells);
    5555                accel   = (LPACCEL)GlobalLock(hRetval);
    56        
     56
    5757                for (i=0;i<nrofaccells;i++) {
    5858                        accel[i].fVirt = accel_table[i].fVirt;
Note: See TracChangeset for help on using the changeset viewer.