diff --git a/goldlib/gall/gctype.h b/goldlib/gall/gctype.h
index b909dd0..b1db555 100644
--- a/goldlib/gall/gctype.h
+++ b/goldlib/gall/gctype.h
@@ -45,11 +45,12 @@
 #include <sys/nls.h>
 #ifdef __cplusplus
 extern "C" {
-#endif
-__inline__ int tolower(int a) { return _nls_tolower((unsigned char)(a)); }
-__inline__ int toupper(int a) { return _nls_toupper((unsigned char)(a)); }
-#ifdef __cplusplus
+__inline__ int tolower(int c) { return _nls_tolower((unsigned char)(c)); }
+__inline__ int toupper(int c) { return _nls_toupper((unsigned char)(c)); }
 }
+#else
+#define tolower(c) _nls_tolower((unsigned char)(c))
+#define toupper(c) _nls_toupper((unsigned char)(c))
 #endif
 #elif defined(__WIN32__)
 #ifdef __cplusplus