From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 20 Nov 2006 18:54:31 +0000 (+0000)
Subject: DEVEL15-windows-netidmgr-plugin-vista-vs2005-20061120
X-Git-Tag: openafs-devel-1_5_12~15
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=27774b511278ef452eb3c6eafad6c32befb2a42d;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-netidmgr-plugin-vista-vs2005-20061120


Define _USE_32BIT_TIME_T since that is what tokens contain.

Use cflagsdll instead of cflagsmt to avoid multiply defined entry points


(cherry picked from commit 848d2f1caa8d196831a1fe599694fdce0018136d)
---

diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index 6080e5cda..edaf803b8 100644
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -61,7 +61,7 @@ pldefines=-DUNICODE -D_UNICODE
 cdebug=$(cdebug) -Os -Zi
 cwarn=$(cwarn) /Wp64 /WX
 
-plcflags=$(cdebug) $(cflags) $(incflags) $(pldefines) $(cwarn) $(cvarsmt)
+plcflags=$(cdebug) $(cflags) $(incflags) $(pldefines) $(cwarn) $(cvarsdll)
 
 PC2OBJ=$(CC) $(plcflags) /Fo"$@" /c $**
 
diff --git a/src/WINNT/netidmgr_plugin/afscred.h b/src/WINNT/netidmgr_plugin/afscred.h
index dbf522a8c..5a63d83ea 100644
--- a/src/WINNT/netidmgr_plugin/afscred.h
+++ b/src/WINNT/netidmgr_plugin/afscred.h
@@ -27,6 +27,7 @@
 #ifndef __KHIMAIRA_AFSCRED_H
 #define __KHIMAIRA_AFSCRED_H
 
+#define _USE_32BIT_TIME_T 1
 #define _WINSOCKAPI_
 #include<windows.h>
 #include<time.h>