From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 26 Apr 2011 01:29:46 +0000 (-0400)
Subject: Windows: avoid preprocessor symbols redefinitions
X-Git-Tag: upstream/1.8.0_pre1^2~3820
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c22155f68cbcc206085c9b76a5b769a8399841f4;p=packages%2Fo%2Fopenafs.git

Windows: avoid preprocessor symbols redefinitions

In afskfw.h avoid preprocessor symbol redefinitions when
RD_AP_TIME or INTK_BADPW are already defined.

Change-Id: Iccc02abf1cfd7a7941494085c1c935e89f415801
Reviewed-on: http://gerrit.openafs.org/4558
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/WINNT/afsd/afskfw.h b/src/WINNT/afsd/afskfw.h
index fe5d87e37..565f37a96 100644
--- a/src/WINNT/afsd/afskfw.h
+++ b/src/WINNT/afsd/afskfw.h
@@ -88,8 +88,12 @@ int  KFW_AFS_copy_system_file_to_default_cache(char *);
 #define         KERB_ERR_NULL_KEY                       10
 
 /* From afs/krb.h */
+#ifndef RD_AP_TIME
 #define           RD_AP_TIME     37       /* delta_t too big */
+#endif
+#ifndef INTK_BADPW
 #define           INTK_BADPW     62       /* Incorrect password */
+#endif
 
 #define PROBE_USERNAME               "OPENAFS-KDC-PROBE"
 #define PROBE_PASSWORD_LEN           16