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/osliblvm.h

    r9693 r21916  
    1515#endif
    1616
    17 #include <win\winioctl.h>
     17#include <win/winioctl.h>
    1818
    1919#ifdef OS2_INCLUDED
    … …  
    3030typedef unsigned long      LBA;
    3131
    32 /* Define a Partition Sector Number.  A Partition Sector Number is 
    33    relative to the start of a partition. The first sector in a partition 
     32/* Define a Partition Sector Number.  A Partition Sector Number is
     33   relative to the start of a partition. The first sector in a partition
    3434   is PSN 0. */
    3535typedef unsigned long      PSN;
    … …  
    330330HANDLE OSLibLVMQueryVolumeControlData();
    331331void   OSLibLVMFreeVolumeControlData(HANDLE hVolumeControlData);
    332 BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 
     332BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex,
    333333                               LPSTR lpszVolumeName, DWORD cchBufferLength);
    334334
    … …  
    338338ULONG  OSLibLVMGetDriveType(LPCSTR lpszVolume);
    339339CHAR   OSLibLVMQueryDriveFromVolumeName(LPCSTR lpszVolume);
    340 BOOL   OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, 
     340BOOL   OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName,
    341341                                                DWORD cchBufferLength);
    342342
Note: See TracChangeset for help on using the changeset viewer.