X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=mech_eap%2Futil.h;fp=mech_eap%2Futil.h;h=ae8392331859fc178fd3ec5d5cccd6b38da91150;hp=5f0bc9dc7cf15a97618913f435e29bf843878644;hb=5bf61a81066da96847e6317c00db9d4f96447db2;hpb=77eab72ae59381941a8dc46182e9a833fde87938

diff --git a/mech_eap/util.h b/mech_eap/util.h
index 5f0bc9d..ae83923 100644
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -85,7 +85,7 @@ extern "C" {
 #define MIN(_a,_b)  ((_a)<(_b)?(_a):(_b))
 #endif
 
-#if !defined(WIN32) && (!(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)))
+#if !defined(WIN32) && !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define GSSEAP_UNUSED __attribute__ ((__unused__))
 #else
 #define GSSEAP_UNUSED
@@ -779,13 +779,12 @@ verifyTokenHeader(OM_uint32 *minor,
 #define GSSEAP_GET_LAST_ERROR()		(GetLastError())
 
 #define GSSEAP_MUTEX                    CRITICAL_SECTION
-
 #define GSSEAP_MUTEX_INIT(m)            (InitializeCriticalSection((m)), 0)
 #define GSSEAP_MUTEX_DESTROY(m)         DeleteCriticalSection((m))
 #define GSSEAP_MUTEX_LOCK(m)            EnterCriticalSection((m))
 #define GSSEAP_MUTEX_UNLOCK(m)          LeaveCriticalSection((m))
 
-/* XXX yet to implement thread-local wrappers */
+/* Thread-local is handled separately */
 
 #define GSSEAP_THREAD_ONCE              INIT_ONCE
 #define GSSEAP_ONCE(o, i)               InitOnceExecuteOnce((o), (i))
@@ -798,7 +797,6 @@ verifyTokenHeader(OM_uint32 *minor,
 #define GSSEAP_GET_LAST_ERROR()		(errno)
 
 #define GSSEAP_MUTEX                    pthread_mutex_t
-
 #define GSSEAP_MUTEX_INIT(m)            pthread_mutex_init((m), NULL)
 #define GSSEAP_MUTEX_DESTROY(m)         pthread_mutex_destroy((m))
 #define GSSEAP_MUTEX_LOCK(m)            pthread_mutex_lock((m))
@@ -989,7 +987,7 @@ gssEapDestroyKrbContext(krb5_context context);
 #include "util_json.h"
 #include "util_attr.h"
 #include "util_base64.h"
-#endif
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
 #ifdef GSSEAP_ENABLE_REAUTH
 #include "util_reauth.h"
 #endif