[ros-diffs] [akhaldi] 69027: [LIBXML2] Actually, the VS build has the /wd4189 flag before /we4189 rendering it useless. Use another approach to silencing it.

Author: akhaldi
Date: Sat Sep  5 14:29:27 2015
New Revision: 69027

URL: http://svn.reactos.org/svn/reactos?rev=69027&view=rev
Log:
[LIBXML2] Actually, the VS build has the /wd4189 flag before /we4189 rendering it useless.
Use another approach to silencing it.

Removed:
    trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff
Modified:
    trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt
    trunk/reactos/lib/3rdparty/libxml2/uri.c

Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake…
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt	[iso-8859-1] Sat Sep  5 14:29:27
2015
@@ -68,7 +68,7 @@
 add_dependencies(libxml2 psdk)
 
 if(MSVC)
-	add_target_compile_flags(libxml2 "/wd4189")
+    replace_compile_flags("/we4189" " ")
 else()
     add_target_compile_flags(libxml2 "-w")
 endif()

Removed: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm…
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff	(removed)
@@ -1,14 +0,0 @@
-Index: uri.c
-===================================================================
---- uri.c	(revision 69017)
-+++ uri.c	(working copy)
-@@ -2389,7 +2389,9 @@
-  */
- #if defined(_WIN32) && !defined(__CYGWIN__)
-     int len = 0;
-+#ifndef __REACTOS__
-     int i = 0;
-+#endif
-     xmlChar *p = NULL;
- #endif
-     xmlURIPtr uri;

Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c…
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/uri.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/uri.c	[iso-8859-1] Sat Sep  5 14:29:27 2015
@@ -2389,9 +2389,7 @@
  */
 #if defined(_WIN32) && !defined(__CYGWIN__)
     int len = 0;
-#ifndef __REACTOS__
     int i = 0;
-#endif
     xmlChar *p = NULL;
 #endif
     xmlURIPtr uri;