From c433d83bb334c2fe9665201c401b4e363ab3842f Mon Sep 17 00:00:00 2001 From: leonidk Date: Thu, 17 Jul 2008 08:16:01 +0000 Subject: [PATCH] [IBAL] This patch fixes the build error due to CSQ use for XP builds. Signed-off-by: Fab Tillier git-svn-id: svn://openib.tc.cornell.edu/gen1@1408 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/core/al/kernel/SOURCES | 9 --------- trunk/core/al/kernel/al_ndi_cm.c | 3 +++ trunk/core/bus/kernel/SOURCES | 8 ++------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/trunk/core/al/kernel/SOURCES b/trunk/core/al/kernel/SOURCES index d88f37b4..5f2e33f6 100644 --- a/trunk/core/al/kernel/SOURCES +++ b/trunk/core/al/kernel/SOURCES @@ -62,15 +62,6 @@ C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS \ 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 diff --git a/trunk/core/al/kernel/al_ndi_cm.c b/trunk/core/al/kernel/al_ndi_cm.c index 66994e5a..948b8152 100644 --- a/trunk/core/al/kernel/al_ndi_cm.c +++ b/trunk/core/al/kernel/al_ndi_cm.c @@ -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 diff --git a/trunk/core/bus/kernel/SOURCES b/trunk/core/bus/kernel/SOURCES index 845be81b..2e584605 100644 --- a/trunk/core/bus/kernel/SOURCES +++ b/trunk/core/bus/kernel/SOURCES @@ -31,12 +31,8 @@ TARGETLIBS= \ $(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 -- 2.41.0