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/timer.cpp

    r10544 r21916  
    2020#include <winconst.h>
    2121#include <misc.h>
    22 #include <win32wbase.h>
     22#include "win32wbase.h"
    2323#include "oslibutil.h"
    2424#include "timer.h"
    … …  
    252252}
    253253
     254extern "C" {
     255
    254256/***********************************************************************
    255257 *           SetTimer32   (USER32.511)
    … …  
    304306}
    305307
     308} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.