Alexandre Julliard : makefiles: Remove useless definitions of COM_NO_WINDOWS_H.
Alexandre Julliard
julliard at winehq.org
Mon Oct 14 12:39:28 CDT 2013
Module: wine
Branch: master
Commit: 55e44092bd56cba4dff41cb85ae245d2a9e67660
URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e44092bd56cba4dff41cb85ae245d2a9e67660
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sun Oct 13 18:04:47 2013 +0200
makefiles: Remove useless definitions of COM_NO_WINDOWS_H.
---
dlls/browseui/Makefile.in | 1 -
dlls/dplayx/Makefile.in | 1 -
dlls/explorerframe/Makefile.in | 1 -
dlls/gameux/Makefile.in | 1 -
dlls/infosoft/Makefile.in | 1 -
dlls/inseng/Makefile.in | 1 -
dlls/itss/Makefile.in | 1 -
dlls/mlang/Makefile.in | 1 -
dlls/mshtml/Makefile.in | 1 -
dlls/msxml3/Makefile.in | 1 -
dlls/msxml4/Makefile.in | 1 -
dlls/msxml6/Makefile.in | 1 -
dlls/ole32/Makefile.in | 3 +--
dlls/oleaut32/Makefile.in | 3 +--
dlls/oledb32/Makefile.in | 1 -
dlls/query/Makefile.in | 1 -
dlls/rpcrt4/Makefile.in | 2 +-
dlls/rsabase/Makefile.in | 1 -
dlls/rsaenh/Makefile.in | 1 -
dlls/shell32/Makefile.in | 2 +-
dlls/sti/tests/Makefile.in | 2 +-
dlls/wuapi/Makefile.in | 1 -
22 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index b463cd7..cdd066d 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -1,6 +1,5 @@
MODULE = browseui.dll
IMPORTS = uuid ole32 comctl32 user32 advapi32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
aclmulti.c \
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 164b271..9c62659 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = dplayx.dll
IMPORTLIB = dplayx
IMPORTS = dxguid uuid winmm ole32 user32 advapi32
diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in
index dcb2826..dc523a1 100644
--- a/dlls/explorerframe/Makefile.in
+++ b/dlls/explorerframe/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = explorerframe.dll
IMPORTS = uuid ole32 shell32 user32
diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in
index 3b52a63..f3d4612 100644
--- a/dlls/gameux/Makefile.in
+++ b/dlls/gameux/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = gameux.dll
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index f6af67c..f7c1bbf 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -1,6 +1,5 @@
MODULE = infosoft.dll
IMPORTS = uuid advapi32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
infosoft_main.c \
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index 6a76691..ea053cf 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -1,6 +1,5 @@
MODULE = inseng.dll
IMPORTS = uuid ole32 advapi32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
inseng_main.c
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index 4de0d26..af7aee4 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -1,6 +1,5 @@
MODULE = itss.dll
IMPORTS = uuid urlmon shlwapi ole32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
chm_lib.c \
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index c12b33a..a066b53 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -2,7 +2,6 @@ MODULE = mlang.dll
IMPORTLIB = mlang
IMPORTS = uuid ole32 gdi32 advapi32
DELAYIMPORTS = oleaut32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
mlang.c
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index e479bf8..65d0056 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -1,7 +1,6 @@
MODULE = mshtml.dll
IMPORTLIB = mshtml
IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
-EXTRADEFS = -DCOM_NO_WINDOWS_H
DELAYIMPORTS = wininet
C_SRCS = \
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 4c9d00a..1e056cf 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = msxml3.dll
IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRALIBS = @XML2_LIBS@
diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in
index c4115b2..eb2eca5 100644
--- a/dlls/msxml4/Makefile.in
+++ b/dlls/msxml4/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = msxml4.dll
IMPORTS = ole32 advapi32
diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in
index 4a7f756..9f4a7d2 100644
--- a/dlls/msxml6/Makefile.in
+++ b/dlls/msxml6/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = msxml6.dll
IMPORTS = oleaut32 ole32 advapi32
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index f24f035..8174f28 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -2,8 +2,7 @@ MODULE = ole32.dll
IMPORTLIB = ole32
IMPORTS = uuid advapi32 user32 gdi32 rpcrt4
DELAYIMPORTS = oleaut32
-EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \
- -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL
+EXTRADEFS = -D_OLE32_ -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL
C_SRCS = \
antimoniker.c \
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 69bfe62..7d215b7 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -2,8 +2,7 @@ MODULE = oleaut32.dll
IMPORTLIB = oleaut32
IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32
DELAYIMPORTS = comctl32 urlmon windowscodecs
-EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \
- -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
+EXTRADEFS = -D_OLEAUT32_ -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
C_SRCS = \
connpt.c \
diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in
index 0f4f36a..449913a 100644
--- a/dlls/oledb32/Makefile.in
+++ b/dlls/oledb32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = oledb32.dll
IMPORTS = uuid oleaut32 ole32 user32 advapi32
diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in
index ff67194..9dd81d2 100644
--- a/dlls/query/Makefile.in
+++ b/dlls/query/Makefile.in
@@ -1,6 +1,5 @@
MODULE = query.dll
IMPORTS = uuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
query_main.c
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 812e7aa..8326cf5 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG
+EXTRADEFS = -D_RPCRT4_ -DMSWMSG
MODULE = rpcrt4.dll
IMPORTLIB = rpcrt4
IMPORTS = uuid advapi32
diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in
index db0ebd5..11b647d 100644
--- a/dlls/rsabase/Makefile.in
+++ b/dlls/rsabase/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = rsabase.dll
IMPORTS = rsaenh
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index ef4ea5e..a80b97f 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = rsaenh.dll
IMPORTLIB = rsaenh
IMPORTS = crypt32 advapi32
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index ef2d734..dd3f8f4 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H
+EXTRADEFS = -D_SHELL32_
MODULE = shell32.dll
IMPORTLIB = shell32
IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32
diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in
index 4d4a4d0..008b5be 100644
--- a/dlls/sti/tests/Makefile.in
+++ b/dlls/sti/tests/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
+EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
TESTDLL = sti.dll
IMPORTS = uuid ole32
diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in
index 81d50ba..ca04185 100644
--- a/dlls/wuapi/Makefile.in
+++ b/dlls/wuapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = wuapi.dll
IMPORTS = uuid ole32 advapi32
More information about the wine-cvs
mailing list