[ofw] [PATCH] Fix XP build

Fab Tillier ftillier at windows.microsoft.com
Wed Jul 16 18:42:44 PDT 2008


This patch fixes the build error due to CSQ use for XP builds.

Signed-off-by: Fab Tillier <ftillier at microsoft.com>

Index: core/bus/kernel/SOURCES
===================================================================
--- core/bus/kernel/SOURCES     (revision 1404)
+++ core/bus/kernel/SOURCES     (working copy)
@@ -31,12 +31,8 @@
        $(TARGETPATH)\*\complib.lib \
        $(TARGETPATH)\*\ibal.lib

-!if !defined(DDK_TARGET_OS) || "$(DDK_TARGET_OS)"=="Win2K"
-#
-# The driver is built in the Win2K build environment
-# - use the library version of safe strings
-#
-TARGETLIBS= $(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib
+!if !defined(DDK_TARGET_OS) || "$(DDK_TARGET_OS)"=="WinXP"
+TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\csq.lib
 !endif

 !IFDEF ENABLE_EVENT_TRACING
Index: core/al/kernel/SOURCES
===================================================================
--- core/al/kernel/SOURCES      (revision 1404)
+++ core/al/kernel/SOURCES      (working copy)
@@ -62,16 +62,7 @@

 TARGETLIBS= \
        $(TARGETPATH)\*\complib.lib
-
-!if !defined(DDK_TARGET_OS) || "$(DDK_TARGET_OS)"=="Win2K"
-#
-# The driver is built in the Win2K build environment
-# - use the library version of safe strings
-#
-TARGETLIBS= $(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib
-!endif

-
 !IFDEF ENABLE_EVENT_TRACING

 C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
Index: core/al/kernel/al_ndi_cm.c
===================================================================
--- core/al/kernel/al_ndi_cm.c  (revision 1404)
+++ core/al/kernel/al_ndi_cm.c  (working copy)
@@ -38,6 +38,9 @@
 #include "al.h"
 #include "al_mgr.h"
 #include "al_debug.h"
+#if WINVER <= 0x501
+#include "csq.h"
+#endif

 #if defined(EVENT_TRACING)
 #ifdef offsetof
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xp_bld_fix.patch
Type: application/octet-stream
Size: 1621 bytes
Desc: xp_bld_fix.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080716/70f7981a/attachment.obj>


More information about the ofw mailing list