From: Chaskiel Grundman <cg2v@andrew.cmu.edu>
Date: Thu, 15 Aug 2013 03:31:46 +0000 (-0400)
Subject: Eliminate pointless changes between nbsd50/60 params
X-Git-Tag: upstream/1.6.6_pre2^2~100
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=821bfd32682164f29228770c8152d68f37837b4b;p=packages%2Fo%2Fopenafs.git

Eliminate pointless changes between nbsd50/60 params

param.nbsd60.h removed AFS_64BIT_ENV and added an empty expression
to an #if.

AFS_64BIT_ENV is required for any platform to build (on 1.6)
This is a 1.6-only change. On master, AFS_64BIT_ENV was removed entirely
in commit fc9aa428.

Change-Id: I57d7e2a2ef5ab4bf787a99083d35ba70e240710c
Reviewed-on: http://gerrit.openafs.org/10137
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
Tested-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/config/param.nbsd60.h b/src/config/param.nbsd60.h
index f37b71222..c91db35c0 100644
--- a/src/config/param.nbsd60.h
+++ b/src/config/param.nbsd60.h
@@ -3,6 +3,7 @@
 #ifndef	AFS_PARAM_COMMON_H
 #define	AFS_PARAM_COMMON_H 1
 
+#define AFS_64BIT_ENV  1
 #define AFS_NAMEI_ENV  1	/* User space interface to file system */
 #define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
 #define AFS_64BIT_CLIENT 1
@@ -157,7 +158,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define CMSERVERPREF
 #endif
 
-#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) && !defined()
+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
 #include <limits.h>
 #include <sys/param.h>
 #include <sys/types.h>