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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index ded6e66..58c7b6a 100644 (file)
--- 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 1c68272..fbb2b80 100644 (file)
--- 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 <pthread.h>
 # ifdef HAVE_PTHREAD_NP_H
 #  include <pthread_np.h>