[EXT2LIB]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61515

diff --git a/reactos/lib/fslib/ext2lib/Disk.c b/reactos/lib/fslib/ext2lib/Disk.c
index ea8e6f1..e6854f1 100644 (file)
--- a/reactos/lib/fslib/ext2lib/Disk.c
+++ b/reactos/lib/fslib/ext2lib/Disk.c
@@ -8,11 +8,10 @@
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"

-#include <debug.h>
-
-/* DEFINITIONS ***********************************************************/
-

 
 

+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <debug.h>

 
 /* FUNCTIONS *************************************************************/
 
 
 /* FUNCTIONS *************************************************************/
 

diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.c b/reactos/lib/fslib/ext2lib/Mke2fs.c
index ed76155..6477408 100644 (file)
--- a/reactos/lib/fslib/ext2lib/Mke2fs.c
+++ b/reactos/lib/fslib/ext2lib/Mke2fs.c
@@ -8,6 +8,8 @@
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"

+
+#include <fmifs/fmifs.h>

 #include <debug.h>
 
 /* GLOBALS ***************************************************************/
 #include <debug.h>
 
 /* GLOBALS ***************************************************************/

diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.h b/reactos/lib/fslib/ext2lib/Mke2fs.h
index 71dccef..be19468 100644 (file)
--- a/reactos/lib/fslib/ext2lib/Mke2fs.h
+++ b/reactos/lib/fslib/ext2lib/Mke2fs.h
@@ -8,20 +8,11 @@
 /* INCLUDES **************************************************************/
 
 #define NTOS_MODE_USER
 /* INCLUDES **************************************************************/
 
 #define NTOS_MODE_USER

-#include <ndk/iofuncs.h>

 #include <ndk/kefuncs.h>
 #include <ndk/kefuncs.h>

-#include <ndk/obfuncs.h>

 #include <ndk/rtlfuncs.h>
 #include <ndk/rtlfuncs.h>

-#include <fmifs/fmifs.h>

 
 

-#include "string.h"
-#include "ctype.h"
-
-#include "types.h"

 #include "ext2_fs.h"
 
 #include "ext2_fs.h"
 

-#include "getopt.h"
-

 /* DEFINITIONS ***********************************************************/
 
 #define SECTOR_SIZE (Ext2Sys->DiskGeometry.BytesPerSector)
 /* DEFINITIONS ***********************************************************/
 
 #define SECTOR_SIZE (Ext2Sys->DiskGeometry.BytesPerSector)