more w32api conversion. Send errors.h to the Trash Can

svn path=/trunk/; revision=14518

reactos/apps/utils/net/route/makefile

@@ -12,7 +12,7 @@ TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a
 
 TARGET_OBJECTS = $(TARGET_NAME).o
 
-TARGET_GCCLIBS = 
+TARGET_CFLAGS = -D__USE_W32API
 
 include $(PATH_TO_TOP)/rules.mak
 

reactos/include/windows.h

@@ -60,11 +60,6 @@
 /* Base definitions */
 #include <base.h>
 
-/* WIN32 messages */
-//#ifndef WIN32_LEAN_AND_MEAN
-//#include <messages.h>
-//#endif
-
 /* WIN32 definitions */
 #include <defines.h>
 
@@ -84,19 +79,12 @@
 #endif /* ! defined (RC_INVOKED) */
 
 /* WIN32 error codes */
-#ifndef WIN32_LEAN_AND_MEAN
-#include <errors.h>
-#endif
+//#ifndef WIN32_LEAN_AND_MEAN
+//#include <errors.h>
+//#endif
 
 #ifndef RC_INVOKED
 
-/* Windows sockets specification version 1.1 */
-#ifdef Win32_Winsock
-#ifndef WIN32_LEAN_AND_MEAN
-#include <sockets.h>
-#endif
-#endif
-
 /* There is a conflict with BOOL between Objective-C and Win32,
    so the Windows32 API Library defines and uses WINBOOL.
    However, if we are not using Objective-C then define the normal

reactos/lib/rtl/error.c

@@ -20,7 +20,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <errors.h>
+#include <winerror.h>
 
 #define NDEBUG
 #include <debug.h>

reactos/lib/samlib/samlib.c

@@ -28,6 +28,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <windows.h>
+#include <winerror.h>
 #include <string.h>
 
 #include <samlib.h>

reactos/lib/wininet/stubs.c

@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <winerror.h>
 #include <wininet.h>
 
 #define NDEBUG

reactos/lib/winspool/stubs.c

@@ -10,6 +10,7 @@
 
 #undef __USE_W32API
 #include <windows.h>
+#include <winerror.h>
 
 /*
  * @unimplemented