[ros-diffs] [janderwald] 25644: - wrap include_next in macro (msvc doesnot understand this)
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Sat Jan 27 00:17:03 CET 2007
Author: janderwald
Date: Sat Jan 27 02:17:02 2007
New Revision: 25644
URL: http://svn.reactos.org/svn/reactos?rev=25644&view=rev
Log:
- wrap include_next in macro (msvc doesnot understand this)
Modified:
trunk/reactos/include/reactos/wine/commdlg.h
trunk/reactos/include/reactos/wine/debug.h
trunk/reactos/include/reactos/wine/dlgs.h
trunk/reactos/include/reactos/wine/objbase.h
trunk/reactos/include/reactos/wine/shellapi.h
trunk/reactos/include/reactos/wine/shlguid.h
trunk/reactos/include/reactos/wine/shlobj.h
trunk/reactos/include/reactos/wine/shlwapi.h
trunk/reactos/include/reactos/wine/windef.h
trunk/reactos/include/reactos/wine/wingdi.h
trunk/reactos/include/reactos/wine/winuser.h
Modified: trunk/reactos/include/reactos/wine/commdlg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commdlg.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/commdlg.h (original)
+++ trunk/reactos/include/reactos/wine/commdlg.h Sat Jan 27 02:17:02 2007
@@ -7,4 +7,6 @@
#include <objbase.h>
#endif
+#if !defined (_MSC_VER)
#include_next <commdlg.h>
+#endif
Modified: trunk/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/debug.h (original)
+++ trunk/reactos/include/reactos/wine/debug.h Sat Jan 27 02:17:02 2007
@@ -4,7 +4,9 @@
#include "../roscfg.h"
#include <stdarg.h>
#include <windef.h>
+#if !defined(_MSC_VER)
#include <winnt.h>
+#endif
/* Add ROS Master debug functions if not added yet */
#ifndef __INTERNAL_DEBUG
Modified: trunk/reactos/include/reactos/wine/dlgs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dlgs.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/dlgs.h (original)
+++ trunk/reactos/include/reactos/wine/dlgs.h Sat Jan 27 02:17:02 2007
@@ -13,6 +13,8 @@
#define OFN_ENABLEINCLUDENOTIFY 0x00400000
#define NEWFILEOPENORD 1547
+#if !defined (_MSC_VER)
#include_next <dlgs.h>
+#endif
#endif /* __WINE_DLGS_H */
Modified: trunk/reactos/include/reactos/wine/objbase.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/objbase.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/objbase.h (original)
+++ trunk/reactos/include/reactos/wine/objbase.h Sat Jan 27 02:17:02 2007
@@ -24,7 +24,9 @@
#define DBG 1
#endif
+#if !defined(_MSC_VER)
#include_next <objbase.h>
+#endif
#ifndef _OBJBASE_H_
#define _OBJBASE_H_
Modified: trunk/reactos/include/reactos/wine/shellapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/shellapi.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/shellapi.h (original)
+++ trunk/reactos/include/reactos/wine/shellapi.h Sat Jan 27 02:17:02 2007
@@ -7,7 +7,9 @@
* and definitions that are missing in w32api.
*/
+#if !defined (_MSC_VER)
#include_next <shellapi.h>
+#endif
#ifndef _WINE_SHELLAPI_H
#define _WINE_SHELLAPI_H
Modified: trunk/reactos/include/reactos/wine/shlguid.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/shlguid.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/shlguid.h (original)
+++ trunk/reactos/include/reactos/wine/shlguid.h Sat Jan 27 02:17:02 2007
@@ -7,7 +7,9 @@
* and definitions that are missing in w32api.
*/
+#if !defined (_MSC_VER)
#include_next <shlguid.h>
+#endif
#ifndef __WINE_SHLGUID_H
Modified: trunk/reactos/include/reactos/wine/shlobj.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/shlobj.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/shlobj.h (original)
+++ trunk/reactos/include/reactos/wine/shlobj.h Sat Jan 27 02:17:02 2007
@@ -9,7 +9,9 @@
#include <winnetwk.h>
+#if !defined (_MSC_VER)
#include_next <shlobj.h>
+#endif
#include <shlguid.h>
#include <shobjidl.h>
Modified: trunk/reactos/include/reactos/wine/shlwapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/shlwapi.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/shlwapi.h (original)
+++ trunk/reactos/include/reactos/wine/shlwapi.h Sat Jan 27 02:17:02 2007
@@ -6,8 +6,9 @@
* build system. It contains definitions commonly refered to as Wineisms
* and definitions that are missing in w32api.
*/
-
+#if !defined (_MSC_VER)
#include_next <shlwapi.h>
+#endif
#ifndef __WINE_SHLWAPI_H
#define __WINE_SHLWAPI_H
Modified: trunk/reactos/include/reactos/wine/windef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/windef.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/windef.h (original)
+++ trunk/reactos/include/reactos/wine/windef.h Sat Jan 27 02:17:02 2007
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if !defined(_MSC_VER)
#include_next "windef.h"
+#endif
#ifndef __WINE_WINDEF_H
#define __WINE_WINDEF_H
Modified: trunk/reactos/include/reactos/wine/wingdi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wingdi.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/wingdi.h (original)
+++ trunk/reactos/include/reactos/wine/wingdi.h Sat Jan 27 02:17:02 2007
@@ -12,6 +12,8 @@
#define NTM_TT_OPENTYPE 0x00040000 /* wingdi.h */
#define NTM_TYPE1 0x00100000 /* wingdi.h */
+#if !defined(_MSC_VER)
#include_next <wingdi.h>
+#endif
#endif /* __WINE_GDI_H */
Modified: trunk/reactos/include/reactos/wine/winuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winuser.h?rev=25644&r1=25643&r2=25644&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/winuser.h (original)
+++ trunk/reactos/include/reactos/wine/winuser.h Sat Jan 27 02:17:02 2007
@@ -5,9 +5,11 @@
* Compatibility header
*/
-#include <w32api.h>
#include <wingdi.h>
+
+#if !defined(_MSC_VER)
#include_next <winuser.h>
+#endif
#define WS_EX_TRAYWINDOW 0x80000000L
#define DCX_USESTYLE 0x00010000
More information about the Ros-diffs
mailing list