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/advapi32/security_odin.cpp

    r7983 r21916  
    1212 *  FIXME: for all functions thunking down to Rtl* functions:  implement SetLastError()
    1313 */
     14
     15#include <string.h>
     16
    1417#ifdef __WIN32OS2__
    1518#include <os2win.h>
    1619#include <heapstring.h>
    1720#endif
    18 
    19 #include <string.h>
    2021
    2122#include "windef.h"
Note: See TracChangeset for help on using the changeset viewer.