[SPOOLSS]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61446

diff --git a/reactos/dll/win32/spoolss/router.c b/reactos/dll/win32/spoolss/router.c
index d48253e..53a2d3f 100644 (file)
--- a/reactos/dll/win32/spoolss/router.c
+++ b/reactos/dll/win32/spoolss/router.c
@@ -18,23 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
+#include "spoolss.h"
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
 #include <winreg.h>
-
 #include <wingdi.h>
 #include <winspool.h>
-#include <ddk/winsplp.h>
-#include "spoolss.h"
-
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(spoolss);
+#include <ddk/winsplp.h>
 
 /* ################################ */
 

diff --git a/reactos/dll/win32/spoolss/spoolss.h b/reactos/dll/win32/spoolss/spoolss.h
index 6190286..a56cba7 100644 (file)
--- a/reactos/dll/win32/spoolss/spoolss.h
+++ b/reactos/dll/win32/spoolss/spoolss.h
@@ -16,9 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(spoolss);
+
 /* ################################ */
 
 BOOL backend_load_all(void) DECLSPEC_HIDDEN;

diff --git a/reactos/dll/win32/spoolss/spoolss_main.c b/reactos/dll/win32/spoolss/spoolss_main.c
index 25af2e2..79aa77d 100644 (file)
--- a/reactos/dll/win32/spoolss/spoolss_main.c
+++ b/reactos/dll/win32/spoolss/spoolss_main.c
@@ -18,24 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winreg.h"
-
-//#include "wingdi.h"
-//#include "winspool.h"
-//#include "ddk/winsplp.h"
 #include "spoolss.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(spoolss);
-
 /* ################################ */
 
 static HMODULE hwinspool;