diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:27:53 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:27:53 +0000 |
| commit | 2b1c237578707c237f83ec7a32753811c4358d8c (patch) | |
| tree | ac561432e86379bd3f7f2a13041a5df9817a1548 /moz | |
| parent | 7d929134de6cc15987cb061567a8835c8d81c068 (diff) | |
INTEGRATION: CWS mingwport06 (1.15.4); FILE MERGED
2007/08/27 13:56:32 vg 1.15.4.1: #i75499# pragma for MSVC
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index b7a47fbbc650..21fcb7d38c2b 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -9188,6 +9188,20 @@ { T_I8 = TD_INT8 , T_I16 = TD_INT16 , +*** misc/mozilla/xpfe/appshell/src/nsXULWindow.cpp 2004-08-21 19:17:14.000000000 +0200 +--- misc/build/mozilla/xpfe/appshell/src/nsXULWindow.cpp 2007-03-24 11:19:03.000000000 +0200 +*************** +*** 73,79 **** +--- 73,81 ---- + #include "nsStyleConsts.h" + + // XXX Get rid of this ++ #ifdef _MSC_VER + #pragma message("WARNING: XXX bad include, remove it.") ++ #endif + #include "nsIWebShellWindow.h" + #include "nsWebShellWindow.h" // get rid of this one, too... + *** misc/mozilla/xpfe/bootstrap/Makefile.in Thu Jun 24 14:58:48 2004 --- misc/build/mozilla/xpfe/bootstrap/Makefile.in Thu Mar 29 14:27:09 2007 *************** |