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/kernel32/dosdevice.cpp

    r21355 r21916  
    99 * Copyright 1993 Erik Bos
    1010 * Copyright 1996 Alexandre Julliard
    11  * 
     11 *
    1212 * Project Odin Software License can be found in LICENSE.TXT
    1313 *
    … …  
    2424#include <os2win.h>
    2525#include <stdio.h>
     26#include <string.h>
    2627#include <winnls.h>
    2728#include "unicode.h"
    2829#include "handlemanager.h"
    2930#include "handlenames.h"
    30 #include <string.h>
    3131
    3232
    … …  
    150150        }
    151151        *ptr = 0;
    152        
     152
    153153        SetLastError(ERROR_SUCCESS);
    154154        return sizeof(devices)+len;
    … …  
    176176        if(devname[1] == ':' && devname[2] == 0) {
    177177            int ret = GetDriveTypeA(devname);
    178             if(ret != DRIVE_UNKNOWN) 
     178            if(ret != DRIVE_UNKNOWN)
    179179            {
    180180                if(bufsize < 16) {
Note: See TracChangeset for help on using the changeset viewer.