[ros-diffs] [tkreuzer] 50558: [CLASSPNP] Fix build with MSVC

Author: tkreuzer
Date: Sat Jan 29 15:12:40 2011
New Revision: 50558

URL: http://svn.reactos.org/svn/reactos?rev=50558&view=rev
Log:
[CLASSPNP]
Fix build with MSVC

Modified:
    branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/classpnp/class.c
    branches/cmake-bringup/drivers/storage/classpnp/obsolete.c

Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Jan 29
15:12:40 2011
@@ -9,8 +9,12 @@
     -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512
     -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512)
 
-if(NOT MSVC)
-    add_definitions(-mrtd -fno-builtin -w)
+if(ARCH MATCHES i386)
+    if(MSVC)
+        add_definitions(/Gz)
+    else()
+        add_definitions(-mrtd -fno-builtin -w)
+    endif()
 endif()
 
 spec2def(classpnp.sys class.spec)

Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] Sat Jan 29
15:12:40 2011
@@ -2485,7 +2485,7 @@
             retry = TRUE;
         }
 
-        if (retry && (irpStack->Parameters.Others.Argument4--)) {
+        if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--))
{
 
             //
             // Retry request.

Modified: branches/cmake-bringup/drivers/storage/classpnp/obsolete.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sat Jan 29
15:12:40 2011
@@ -161,7 +161,7 @@
             retry = TRUE;
         }
 
-        if (retry && (irpStack->Parameters.Others.Argument4--)) {
+        if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--))
{
 
             //
             // Retry request. If the class driver has supplied a StartIo,