From df4843c4b1f3aebf32dcb28560b259826e9dbb9a Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Wed, 13 Jul 2011 14:20:17 -0400 Subject: [PATCH] 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 --- src/util/afsutil_prototypes.h | 2 +- src/util/pthread_threadname.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index ded6e666da..58c7b6acc6 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 1c6827209e..fbb2b8048d 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