From bfc7376cd93a12f9e286bf721faa6ca60bd2efce Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Wed, 30 Sep 2009 13:28:51 +0000
Subject: [PATCH] - Remove the remaining __USE_W32API, deprecated for ages. -
 Remove _SEH_NO_NATIVE_NLG from msvcrt.rbuild, deprecated long ago. - Get rid
 of __NO_CTYPE_INLINES for everything but host tools, deprecated since
 revision 38052. - Deprecate and remove _DISABLE_TIDENTS.

svn path=/trunk/; revision=43234
---
 reactos/base/setup/usetup/usetup.rbuild       | 1 -
 reactos/base/shell/explorer/Make-rosshell.mak | 2 +-
 reactos/dll/ntdll/ntdll.rbuild                | 1 -
 reactos/dll/win32/kernel32/kernel32.rbuild    | 1 -
 reactos/dll/win32/msvcrt/msvcrt.rbuild        | 1 -
 reactos/dll/win32/snmpapi/snmpapi.rbuild      | 1 -
 reactos/dll/win32/ws2_32/misc/ns.c            | 1 -
 reactos/drivers/filesystems/npfs/npfs.rbuild  | 1 -
 reactos/hal/halamd64/generic/generic.rbuild   | 1 -
 reactos/hal/halamd64/hal_generic.rbuild       | 1 -
 reactos/hal/halamd64/up/halup.rbuild          | 1 -
 reactos/hal/halx86/hal_generic_amd64.rbuild   | 1 -
 reactos/include/psdk/winfax.h                 | 4 ----
 reactos/lib/3rdparty/freetype/freetype.rbuild | 2 --
 reactos/lib/3rdparty/fullfat/fullfat.rbuild   | 1 -
 reactos/lib/cmlib/cmlib.rbuild                | 1 -
 reactos/lib/drivers/oskittcp/oskittcp.rbuild  | 1 -
 reactos/lib/fslib/vfatlib/check/file.c        | 4 ----
 reactos/lib/ppcmmu/ppcmmu.rbuild              | 1 -
 reactos/lib/rtl/rtl.rbuild                    | 1 -
 reactos/lib/sdk/crt/crt.rbuild                | 1 -
 reactos/lib/sdk/crt/libcntpr.rbuild           | 2 --
 reactos/ntoskrnl/ntoskrnl-generic.rbuild      | 1 -
 23 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/reactos/base/setup/usetup/usetup.rbuild b/reactos/base/setup/usetup/usetup.rbuild
index 7dc44c1a921..fa96c8cd59e 100644
--- a/reactos/base/setup/usetup/usetup.rbuild
+++ b/reactos/base/setup/usetup/usetup.rbuild
@@ -6,7 +6,6 @@
 	<include base="zlib">.</include>
 	<include base="inflib">.</include>
 	<include base="ReactOS">include/reactos/drivers</include>
-	<define name="__NO_CTYPE_INLINES" />
 	<library>zlib</library>
 	<library>inflib</library>
 	<library>ext2lib</library>
diff --git a/reactos/base/shell/explorer/Make-rosshell.mak b/reactos/base/shell/explorer/Make-rosshell.mak
index fc00f51cd26..6bc2644f995 100644
--- a/reactos/base/shell/explorer/Make-rosshell.mak
+++ b/reactos/base/shell/explorer/Make-rosshell.mak
@@ -15,7 +15,7 @@ TARGET_NAME := rosshell
 TARGET_INSTALLDIR := .
 
 TARGET_CFLAGS := \
-	-D__USE_W32API -DWIN32 -D_ROS_ \
+	-DWIN32 -D_ROS_ \
 	-D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \
 	-DUNICODE -fexceptions -Wall -g
 
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index 7ba433492ad..01a591ecb48 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -12,7 +12,6 @@
 		<include base="ReactOS">include/reactos/subsys</include>
 		<define name="__NTDLL__" />
 		<define name="_NTOSKRNL_" />
-		<define name="__NO_CTYPE_INLINES" />
 		<library>rtl</library>
 		<library>ntdllsys</library>
 		<library>libcntpr</library>
diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index ec4f0699f41..2c76915441a 100644
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -12,7 +12,6 @@
 	<library>ntdll</library>
 	<define name="_KERNEL32_" />
 	<redefine name="_WIN32_WINNT">0x0600</redefine>
-	<define name="__NO_CTYPE_INLINES" />
 	<dependency>errcodes</dependency>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
 	<pch>k32.h</pch>
diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild
index 3a887172593..9c3f9ef08cf 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.rbuild
+++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild
@@ -6,7 +6,6 @@
 	<define name="_MSVCRT_" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MT" />
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="_CTYPE_DISABLE_MACROS" />
 	<define name="_NO_INLINING" />
 	<linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index 513f52f4796..5c4fac324b5 100644
--- a/reactos/dll/win32/snmpapi/snmpapi.rbuild
+++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild
@@ -3,7 +3,6 @@
 	<include base="snmpapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>wine</library>
diff --git a/reactos/dll/win32/ws2_32/misc/ns.c b/reactos/dll/win32/ws2_32/misc/ns.c
index e298b114921..bb89eadfb0d 100644
--- a/reactos/dll/win32/ws2_32/misc/ns.c
+++ b/reactos/dll/win32/ws2_32/misc/ns.c
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <ws2_32.h>
 #include <winbase.h>
diff --git a/reactos/drivers/filesystems/npfs/npfs.rbuild b/reactos/drivers/filesystems/npfs/npfs.rbuild
index d2f12e8f738..a9030bfc8e6 100644
--- a/reactos/drivers/filesystems/npfs/npfs.rbuild
+++ b/reactos/drivers/filesystems/npfs/npfs.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys">
 	<include base="npfs">.</include>
-	<define name="__NO_CTYPE_INLINES" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>create.c</file>
diff --git a/reactos/hal/halamd64/generic/generic.rbuild b/reactos/hal/halamd64/generic/generic.rbuild
index 7c22ec5013e..8eb4d951a8a 100644
--- a/reactos/hal/halamd64/generic/generic.rbuild
+++ b/reactos/hal/halamd64/generic/generic.rbuild
@@ -4,7 +4,6 @@
 	<module name="hal_generic" type="objectlibrary">
 		<include base="hal_generic">../include</include>
 		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
 		<define name="_NTHAL_" />
 		<file>halinit.c</file>
 		<file>irq.S</file>
diff --git a/reactos/hal/halamd64/hal_generic.rbuild b/reactos/hal/halamd64/hal_generic.rbuild
index 1e0fdc00088..c350c684390 100644
--- a/reactos/hal/halamd64/hal_generic.rbuild
+++ b/reactos/hal/halamd64/hal_generic.rbuild
@@ -4,7 +4,6 @@
 	<module name="hal_generic" type="objectlibrary">
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
 		<define name="_NTHAL_" />
 		<file>hal_generic.c</file>
 	</module>
diff --git a/reactos/hal/halamd64/up/halup.rbuild b/reactos/hal/halamd64/up/halup.rbuild
index 08f72745185..c6e85a4b81d 100644
--- a/reactos/hal/halamd64/up/halup.rbuild
+++ b/reactos/hal/halamd64/up/halup.rbuild
@@ -5,7 +5,6 @@
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halup">../include</include>
 	<include base="ntoskrnl">include</include>
-	<define name="_DISABLE_TIDENTS" />
 	<define name="_NTHAL_" />
 	<library>hal_generic_amd64</library>
 	<library>hal_generic</library>
diff --git a/reactos/hal/halx86/hal_generic_amd64.rbuild b/reactos/hal/halx86/hal_generic_amd64.rbuild
index c343b64e268..1eb9ffe526b 100644
--- a/reactos/hal/halx86/hal_generic_amd64.rbuild
+++ b/reactos/hal/halx86/hal_generic_amd64.rbuild
@@ -4,7 +4,6 @@
 	<module name="hal_generic_amd64" type="objectlibrary">
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
-		<define name="_DISABLE_TIDENTS" />
 		<define name="_NTHAL_" />
 		<directory name="generic">
 			<file>beep.c</file>
diff --git a/reactos/include/psdk/winfax.h b/reactos/include/psdk/winfax.h
index ec738d0d8e3..8a6c46c8f02 100644
--- a/reactos/include/psdk/winfax.h
+++ b/reactos/include/psdk/winfax.h
@@ -493,8 +493,6 @@ typedef struct _FAX_PRINT_INFOW
 typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKA)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMA JobParams, PFAX_COVERAGE_INFOA CoverpageInfo);
 typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKW)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMW JobParams, PFAX_COVERAGE_INFOW CoverpageInfo);
 
-#ifndef _DISABLE_TIDENTS
-
 #ifdef UNICODE
 typedef FAX_JOB_PARAMW FAX_JOB_PARAM;
 typedef PFAX_JOB_PARAMW PFAX_JOB_PARAM;
@@ -589,8 +587,6 @@ typedef PFAX_RECIPIENT_CALLBACKW PFAX_RECIPIENT_CALLBACK;
 #define FaxStartPrintJob FaxStartPrintJobA
 #endif /* UNICODE */
 
-#endif /* _DISABLE_TIDENTS */
-
 typedef BOOL (CALLBACK *PFAX_ROUTING_INSTALLATION_CALLBACKW)(HANDLE FaxHandle, LPVOID Context, LPWSTR MethodName, LPWSTR FriendlyName, LPWSTR FunctionName, LPWSTR Guid);
 #define PFAX_ROUTING_INSTALLATION_CALLBACK PFAX_ROUTING_INSTALLATION_CALLBACKW
 #define FaxRegisterRoutingExtension FaxRegisterRoutingExtensionW
diff --git a/reactos/lib/3rdparty/freetype/freetype.rbuild b/reactos/lib/3rdparty/freetype/freetype.rbuild
index 9e6236e19f8..bf7709ede9d 100644
--- a/reactos/lib/3rdparty/freetype/freetype.rbuild
+++ b/reactos/lib/3rdparty/freetype/freetype.rbuild
@@ -2,9 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="freetype" type="staticlibrary" allowwarnings="true">
 	<include base="freetype">include</include>
-	<define name="_DISABLE_TIDENTS" />
 	<define name="__NTDRIVER__" />
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="FT2_BUILD_LIBRARY"  />
 	<if property="NSWPAT" value="0">
 		<define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" />
diff --git a/reactos/lib/3rdparty/fullfat/fullfat.rbuild b/reactos/lib/3rdparty/fullfat/fullfat.rbuild
index 15871fd96db..df4d3580b01 100644
--- a/reactos/lib/3rdparty/fullfat/fullfat.rbuild
+++ b/reactos/lib/3rdparty/fullfat/fullfat.rbuild
@@ -3,7 +3,6 @@
 <module name="fullfat" type="staticlibrary">
 	<include base="ReactOS">include/reactos/libs/fullfat</include>
 	<define name="__NTDRIVER__" />
-	<define name="__NO_CTYPE_INLINES" />
 
 	<file>ff_blk.c</file>
 	<file>ff_crc.c</file>
diff --git a/reactos/lib/cmlib/cmlib.rbuild b/reactos/lib/cmlib/cmlib.rbuild
index 0498fff7c2c..506eef92334 100644
--- a/reactos/lib/cmlib/cmlib.rbuild
+++ b/reactos/lib/cmlib/cmlib.rbuild
@@ -3,7 +3,6 @@
 <group>
 <module name="cmlib" type="staticlibrary">
 	<include base="cmlib">.</include>
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="_NTOSKRNL_" />
 	<define name="_NTSYSTEM_" />
 	<define name="NASSERT" />
diff --git a/reactos/lib/drivers/oskittcp/oskittcp.rbuild b/reactos/lib/drivers/oskittcp/oskittcp.rbuild
index 809ccf67baf..f67e415b006 100644
--- a/reactos/lib/drivers/oskittcp/oskittcp.rbuild
+++ b/reactos/lib/drivers/oskittcp/oskittcp.rbuild
@@ -3,7 +3,6 @@
 <module name="oskittcp" type="staticlibrary">
 	<define name="__NTDRIVER__"/>
 	<define name="KERNEL"/>
-	<define name="__NO_CTYPE_INLINES" />
 	<include base="oskittcp">include/freebsd</include>
 	<include base="oskittcp">include/freebsd/sys/include</include>
 	<include base="oskittcp">include/freebsd/src/sys</include>
diff --git a/reactos/lib/fslib/vfatlib/check/file.c b/reactos/lib/fslib/vfatlib/check/file.c
index d3cf2ecfa00..097d23c2743 100644
--- a/reactos/lib/fslib/vfatlib/check/file.c
+++ b/reactos/lib/fslib/vfatlib/check/file.c
@@ -5,10 +5,6 @@
 /* FAT32, VFAT, Atari format support, and various fixes additions May 1998
  * by Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de> */
 
-/* Need to define this so that islower isn't inlined
-   (ntdll doesn't export isctype) */
-#define __NO_CTYPE_INLINES
-
 #include "vfatlib.h"
 
 #define NDEBUG
diff --git a/reactos/lib/ppcmmu/ppcmmu.rbuild b/reactos/lib/ppcmmu/ppcmmu.rbuild
index fb70876d083..e082afad098 100644
--- a/reactos/lib/ppcmmu/ppcmmu.rbuild
+++ b/reactos/lib/ppcmmu/ppcmmu.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="ppcmmu" type="staticlibrary">
         <include base="ppcmmu">.</include>
-        <define name="__NO_CTYPE_INLINES" />
         <if property="ARCH" value="powerpc">
                 <file>mmuutil.c</file>
         </if>
diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index 00664ba581c..e4aed9b73f8 100644
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="rtl" type="staticlibrary">
 	<define name="_NTOSKRNL_" />
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="NO_RTL_INLINES" />
 	<define name="_NTSYSTEM_" />
 	<define name="_NTDLLBUILD_" />
diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index 8a9cf951a43..319b0ba66a5 100644
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -24,7 +24,6 @@
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MSVCRT_" />
 	<define name="_MT" />
-	<define name="__NO_CTYPE_INLINES" />
 	<directory name="conio">
 		<file>cgets.c</file>
 		<file>cprintf.c</file>
diff --git a/reactos/lib/sdk/crt/libcntpr.rbuild b/reactos/lib/sdk/crt/libcntpr.rbuild
index 4884817f55a..a305d9117ef 100644
--- a/reactos/lib/sdk/crt/libcntpr.rbuild
+++ b/reactos/lib/sdk/crt/libcntpr.rbuild
@@ -3,11 +3,9 @@
 <module name="libcntpr" type="staticlibrary">
 	<include base="crt">.</include>
 	<include base="crt">include</include>
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="NO_RTL_INLINES" />
 	<define name="_NTSYSTEM_" />
 	<define name="_NTDLLBUILD_" />
-	<define name="_SEH_NO_NATIVE_NLG" />
 	<define name="_LIBCNT_" />
 	<if property="ARCH" value="i386">
 		<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 9f15228593a..0f30116f3cb 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -6,7 +6,6 @@
 	<define name="__NTOSKRNL__" />
 	<define name="_NTOSKRNL_" />
 	<define name="_NTSYSTEM_" />
-	<define name="__NO_CTYPE_INLINES" />
 	<define name="_IN_KERNEL_" />
 	<if property="_WINKD_" value="1">
 		<define name="_WINKD_" />
-- 
2.17.1