dlls: Remove unneeded include directives in resource files.

Francois Gouget fgouget at codeweavers.com
Mon Nov 14 02:54:01 CST 2011


---

This will serve to ensure that one can use winver.h and winresrc.h in rc 
files without first including other headers, just like with the Windows 
SDK.

 dlls/msvcrt/rsrc.rc             |    5 +----
 dlls/ntprint/ntprint.rc         |    3 ---
 dlls/printui/printui.rc         |    3 ---
 dlls/version/tests/version.rc   |    2 --
 dlls/winscard/rsrc.rc           |    5 +----
 include/wine/wine_common_ver.rc |    4 +---
 6 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/dlls/msvcrt/rsrc.rc b/dlls/msvcrt/rsrc.rc
index 39abbef..8fa3de9 100644
--- a/dlls/msvcrt/rsrc.rc
+++ b/dlls/msvcrt/rsrc.rc
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winver.h"
+#include "winresrc.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/dlls/ntprint/ntprint.rc b/dlls/ntprint/ntprint.rc
index ca56d3f..272f151 100644
--- a/dlls/ntprint/ntprint.rc
+++ b/dlls/ntprint/ntprint.rc
@@ -19,9 +19,6 @@
  *
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
 #include "winver.h"
 
 #define WINE_FILENAME_STR "ntprint.dll"
diff --git a/dlls/printui/printui.rc b/dlls/printui/printui.rc
index d8d0d4b..bfbae98 100644
--- a/dlls/printui/printui.rc
+++ b/dlls/printui/printui.rc
@@ -19,9 +19,6 @@
  *
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
 #include "winver.h"
 
 #define WINE_FILENAME_STR "printui.dll"
diff --git a/dlls/version/tests/version.rc b/dlls/version/tests/version.rc
index c754e0c..e7d1b33 100644
--- a/dlls/version/tests/version.rc
+++ b/dlls/version/tests/version.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc
index 8226e9d..3ec383d 100644
--- a/dlls/winscard/rsrc.rc
+++ b/dlls/winscard/rsrc.rc
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winver.h"
+#include "winresrc.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc
index 9cd607f..8447169 100644
--- a/include/wine/wine_common_ver.rc
+++ b/include/wine/wine_common_ver.rc
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winver.h"
+#include "winresrc.h"
 
 /*
 Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number
-- 
1.7.7.1




More information about the wine-patches mailing list