From: Garrett Wollman Date: Wed, 13 Jul 2011 18:20:17 +0000 (-0400) Subject: util: clean up two #ifs X-Git-Tag: upstream/1.8.0_pre1^2~3523 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=df4843c4b1f3aebf32dcb28560b259826e9dbb9a;p=packages%2Fo%2Fopenafs.git util: clean up two #ifs Use defined(...) in two instances to avoid warnings. Change-Id: I0a574283e2384c7cfb2f58884570e78e3fed3bc6 Requested-by: Simon Wilkinson Reviewed-on: http://gerrit.openafs.org/5005 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index ded6e666d..58c7b6acc 100644 --- a/src/util/afsutil_prototypes.h +++ b/src/util/afsutil_prototypes.h @@ -149,7 +149,7 @@ extern int parseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[], /* pthread_threadname.c */ -#if AFS_PTHREAD_ENV && !defined(AFS_NT40_ENV) +#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV) extern void afs_pthread_setname(pthread_t thread, const char *threadname); extern void afs_pthread_setname_self(const char *threadname); #elif defined(AFS_NT40_ENV) diff --git a/src/util/pthread_threadname.c b/src/util/pthread_threadname.c index 1c6827209..fbb2b8048 100644 --- a/src/util/pthread_threadname.c +++ b/src/util/pthread_threadname.c @@ -28,7 +28,7 @@ #include "afsutil.h" -#if AFS_PTHREAD_ENV && !defined(AFS_NT40_ENV) +#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV) # include # ifdef HAVE_PTHREAD_NP_H # include