From 135042cd8c1beee7c045ce3b0b86272bf85a5464 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 12 May 2010 10:25:01 -0400 Subject: [PATCH] Windows: netidmgr_plugin must include afsconfig.h In order to properly use afs headers afsconfig.h must be included first in afsfuncs.c. Update the makefile to specify the correct include paths. Since this results in the afs assert.h being used, we must include the lib file that includes the AssertionFailed function. LICENSE MIT Change-Id: I46f76410ea16eeffeb8406ef4e89120a3255366a Reviewed-on: http://gerrit.openafs.org/1954 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/netidmgr_plugin/NTMakefile | 3 ++- src/WINNT/netidmgr_plugin/afsfuncs.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile index ece6874cd..394228897 100644 --- a/src/WINNT/netidmgr_plugin/NTMakefile +++ b/src/WINNT/netidmgr_plugin/NTMakefile @@ -54,7 +54,7 @@ KFWLIBDIR = ..\kfw\lib\$(CPU) # Build environment kfwincflags=-I$(KFWINCDIR)\krb5\KerberosIV -I$(KFWINCDIR)\loadfuncs -I$(KFWINCDIR)\krb5 -I$(KFWINCDIR)\netidmgr -I$(KFWINCDIR) -afsincflags=-I$(DESTDIR)\include +afsincflags=-I$(DESTDIR)\include -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx incflags=$(kfwincflags) $(afsincflags) -I. pldefines=-DUNICODE -D_UNICODE @@ -107,6 +107,7 @@ LIBFILES= \ SDKLIBFILES= \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\mtafsutil.lib\ $(KFWLIBDIR)\loadfuncs.lib \ htmlhelp.lib \ shell32.lib \ diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c index 93f8df3a4..9dde7ba85 100644 --- a/src/WINNT/netidmgr_plugin/afsfuncs.c +++ b/src/WINNT/netidmgr_plugin/afsfuncs.c @@ -29,6 +29,9 @@ #pragma warning (push) #pragma warning (disable: 4005) +#include +#include + #include #include #include -- 2.39.5