[ros-diffs] [ion] 16364: Fix breakage caused by accidental commit in the last revision

Fix breakage caused by accidental commit in the last revision
Modified: trunk/reactos/include/fslib/vfatlib.h
Modified: trunk/reactos/include/fslib/vfatxlib.h
Modified: trunk/reactos/lib/epsapi/enum/drivers.c
Modified: trunk/reactos/lib/epsapi/enum/modules.c
Modified: trunk/reactos/lib/epsapi/enum/processes.c
Modified: trunk/reactos/lib/fmifs/chkdsk.c
Modified: trunk/reactos/lib/fmifs/compress.c
Modified: trunk/reactos/lib/fmifs/diskcopy.c
Modified: trunk/reactos/lib/fmifs/extend.c
Modified: trunk/reactos/lib/fmifs/format.c
Modified: trunk/reactos/lib/fmifs/init.c
Modified: trunk/reactos/lib/fmifs/label.c
Modified: trunk/reactos/lib/fmifs/media.c
Modified: trunk/reactos/lib/psapi/precomp.h
Modified: trunk/reactos/lib/samlib/samlib.c
Modified: trunk/reactos/lib/syssetup/install.c
Modified: trunk/reactos/subsys/system/format/format.c
Modified: trunk/reactos/subsys/system/usetup/usetup.h
  _____

Modified: trunk/reactos/include/fslib/vfatlib.h
--- trunk/reactos/include/fslib/vfatlib.h	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/include/fslib/vfatlib.h	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -7,7 +7,7 @@

#ifndef __VFATLIB_H
 #define __VFATLIB_H

-#include <fmifs.h>
+#include <fmifs/fmifs.h>

NTSTATUS
 VfatInitialize (VOID);
  _____

Modified: trunk/reactos/include/fslib/vfatxlib.h
--- trunk/reactos/include/fslib/vfatxlib.h	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/include/fslib/vfatxlib.h	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -7,7 +7,7 @@

#ifndef __VFATXLIB_H
 #define __VFATXLIB_H

-#include <fmifs.h>
+#include <fmifs/fmifs.h>

NTSTATUS
 VfatxInitialize (VOID);
  _____

Modified: trunk/reactos/lib/epsapi/enum/drivers.c
--- trunk/reactos/lib/epsapi/enum/drivers.c	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/lib/epsapi/enum/drivers.c	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -21,7 +21,7 @@

#define NDEBUG
 #include <debug.h>

-#include <epsapi.h>
+#include <epsapi/epsapi.h>

NTSTATUS NTAPI
 PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback,
  _____

Modified: trunk/reactos/lib/epsapi/enum/modules.c
--- trunk/reactos/lib/epsapi/enum/modules.c	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/lib/epsapi/enum/modules.c	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -25,7 +25,7 @@

#define NDEBUG
 #include <debug.h>

-#include <epsapi.h>
+#include <epsapi/epsapi.h>

NTSTATUS NTAPI
 PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
  _____

Modified: trunk/reactos/lib/epsapi/enum/processes.c
--- trunk/reactos/lib/epsapi/enum/processes.c	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/lib/epsapi/enum/processes.c	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -35,7 +35,7 @@

#define NTOS_MODE_USER
 #include <ndk/ntndk.h>

-#include <epsapi.h>
+#include <epsapi/epsapi.h>

#define NDEBUG
 #include <debug.h>
  _____

Modified: trunk/reactos/lib/fmifs/chkdsk.c
--- trunk/reactos/lib/fmifs/chkdsk.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/chkdsk.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,9 +12,8 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>
+#include <fmifs/fmifs.h>

-
 /* FMIFS.1 */
 VOID STDCALL
 Chkdsk (PWCHAR		DriveRoot,
  _____

Modified: trunk/reactos/lib/fmifs/compress.c
--- trunk/reactos/lib/fmifs/compress.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/compress.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -13,9 +13,7 @@

#define _UNICODE
 #include <windows.h>
 #include <winioctl.h>
-#include <fmifs.h>

-
 /*
  * @implemented
  */
  _____

Modified: trunk/reactos/lib/fmifs/diskcopy.c
--- trunk/reactos/lib/fmifs/diskcopy.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/diskcopy.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,7 +12,6 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>

/* FMIFS.3 */
 VOID STDCALL
  _____

Modified: trunk/reactos/lib/fmifs/extend.c
--- trunk/reactos/lib/fmifs/extend.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/extend.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,7 +12,6 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>

/* FMIFS.5 */
 VOID STDCALL
  _____

Modified: trunk/reactos/lib/fmifs/format.c
--- trunk/reactos/lib/fmifs/format.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/format.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -14,7 +14,7 @@

#include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
-#include <fmifs.h>
+#include <fmifs/fmifs.h>
 #include <fslib/vfatlib.h>
 #include <string.h>

_____

Modified: trunk/reactos/lib/fmifs/init.c
--- trunk/reactos/lib/fmifs/init.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/init.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,7 +12,6 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>

static BOOL FmIfsInitialized = FALSE;

_____

Modified: trunk/reactos/lib/fmifs/label.c
--- trunk/reactos/lib/fmifs/label.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/label.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,9 +12,7 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>

-
 /* FMIFS.10 */
 VOID STDCALL
 SetLabel (VOID)
  _____

Modified: trunk/reactos/lib/fmifs/media.c
--- trunk/reactos/lib/fmifs/media.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/fmifs/media.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -12,9 +12,7 @@

#define UNICODE
 #define _UNICODE
 #include <windows.h>
-#include <fmifs.h>

-
 /* FMIFS.9 */
 VOID STDCALL
 QuerySupportedMedia (VOID)
  _____

Modified: trunk/reactos/lib/psapi/precomp.h
--- trunk/reactos/lib/psapi/precomp.h	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/psapi/precomp.h	2005-07-01 03:40:52 UTC (rev
16364)
@@ -4,7 +4,7 @@

#include <ndk/ntndk.h>

#include <psapi.h>
-#include <epsapi.h>
+#include <epsapi/epsapi.h>

#include "internal.h"

_____

Modified: trunk/reactos/lib/samlib/samlib.c
--- trunk/reactos/lib/samlib/samlib.c	2005-07-01 03:25:35 UTC (rev
16363)
+++ trunk/reactos/lib/samlib/samlib.c	2005-07-01 03:40:52 UTC (rev
16364)
@@ -32,9 +32,6 @@

#define NTOS_MODE_USER
 #include <ndk/ntndk.h>

-#include <samlib.h>
-
-
 #define NDEBUG
 #include "debug.h"

_____

Modified: trunk/reactos/lib/syssetup/install.c
--- trunk/reactos/lib/syssetup/install.c	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/lib/syssetup/install.c	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -36,7 +36,7 @@

#include <tchar.h>
 #include <stdlib.h>

-#include <samlib.h>
+#include <samlib/samlib.h>
 #include <syssetup.h>
 #include <userenv.h>
 #include <setupapi.h>
  _____

Modified: trunk/reactos/subsys/system/format/format.c
--- trunk/reactos/subsys/system/format/format.c	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/subsys/system/format/format.c	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -5,7 +5,7 @@

#include <stdlib.h>
 #include <string.h>
 #include <windows.h>
-#include <fmifs.h>
+#include <fmifs/fmifs.h>
 #include <tchar.h>
 #include "resource.h"

_____

Modified: trunk/reactos/subsys/system/usetup/usetup.h
--- trunk/reactos/subsys/system/usetup/usetup.h	2005-07-01 03:25:35 UTC
(rev 16363)
+++ trunk/reactos/subsys/system/usetup/usetup.h	2005-07-01 03:40:52 UTC
(rev 16364)
@@ -29,7 +29,7 @@

/* PSDK/NDK */
 #include <windows.h>
-#include <fmifs.h>
+#include <fmifs/fmifs.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>