From 6af65ee19aaaddd184d2bd15a4254157746e3a0a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 26 Mar 2014 12:14:22 -0600
Subject: [PATCH] avoid compiler warnings

---
 racket/src/racket/src/lightning/arm/asm-common.h   |  2 +-
 racket/src/racket/src/lightning/arm/core-common.h  |  2 +-
 racket/src/racket/src/lightning/i386/asm-common.h  |  2 +-
 racket/src/racket/src/lightning/i386/core-common.h |  2 +-
 racket/src/racket/src/lightning/i386/core.h        |  7 +++++++
 racket/src/racket/src/lightning/ppc/asm-common.h   |  2 +-
 racket/src/racket/src/lightning/ppc/core-common.h  |  2 +-
 racket/src/racket/src/mzrt.h                       | 10 ++++++++++
 racket/src/racket/src/nummacs.h                    |  2 ++
 racket/src/racket/src/regexp.c                     |  2 ++
 10 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/racket/src/racket/src/lightning/arm/asm-common.h b/racket/src/racket/src/lightning/arm/asm-common.h
index 8429446ed9..ce518914db 100644
--- a/racket/src/racket/src/lightning/arm/asm-common.h
+++ b/racket/src/racket/src/lightning/arm/asm-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_asm_common_h
+#ifndef __lightning_asm_common_h_
 #define __lightning_asm_common_h_
 
 #if 1
diff --git a/racket/src/racket/src/lightning/arm/core-common.h b/racket/src/racket/src/lightning/arm/core-common.h
index 520ee1c310..8eb1435a4d 100644
--- a/racket/src/racket/src/lightning/arm/core-common.h
+++ b/racket/src/racket/src/lightning/arm/core-common.h
@@ -29,7 +29,7 @@
  *
  ***********************************************************************/
 
-#ifndef __lightning_core_common_h
+#ifndef __lightning_core_common_h_
 #define __lightning_core_common_h_
 
 #define JIT_NOREG			(-1)
diff --git a/racket/src/racket/src/lightning/i386/asm-common.h b/racket/src/racket/src/lightning/i386/asm-common.h
index c2df3dd768..478ad1fd98 100644
--- a/racket/src/racket/src/lightning/i386/asm-common.h
+++ b/racket/src/racket/src/lightning/i386/asm-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_asm_common_h
+#ifndef __lightning_asm_common_h_
 #define __lightning_asm_common_h_
 
 #ifndef _ASM_SAFETY
diff --git a/racket/src/racket/src/lightning/i386/core-common.h b/racket/src/racket/src/lightning/i386/core-common.h
index 590b075998..3fcd51901b 100644
--- a/racket/src/racket/src/lightning/i386/core-common.h
+++ b/racket/src/racket/src/lightning/i386/core-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_core_common_h
+#ifndef __lightning_core_common_h_
 #define __lightning_core_common_h_
 
 /* jit_code: could be a union of many possible function 
diff --git a/racket/src/racket/src/lightning/i386/core.h b/racket/src/racket/src/lightning/i386/core.h
index 7f9115edfd..743ea35567 100644
--- a/racket/src/racket/src/lightning/i386/core.h
+++ b/racket/src/racket/src/lightning/i386/core.h
@@ -472,11 +472,18 @@ struct jit_local_state {
 #define	jit_arg_l()	        (_jitl.nextarg_geti++)
 #define	jit_arg_p()	        (_jitl.nextarg_geti++)
 #define jit_arg_reg(p)          (jit_arg_reg_order[p])
+# ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wunused-const-variable"
+# endif
 # ifdef _WIN64
 static const int jit_arg_reg_order[] = { _ECX, _EDX, JIT_R(8), JIT_R(9) };
 # else
 static const int jit_arg_reg_order[] = { _EDI, _ESI, _EDX, _ECX };
 # endif
+# ifdef __clang__
+#  pragma clang diagnostic pop
+# endif
 #else
 #define	jit_arg_c()		((_jitl.framesize += sizeof(int)) - sizeof(int))
 #define	jit_arg_uc()		((_jitl.framesize += sizeof(int)) - sizeof(int))
diff --git a/racket/src/racket/src/lightning/ppc/asm-common.h b/racket/src/racket/src/lightning/ppc/asm-common.h
index 42c8814a91..c25135744c 100644
--- a/racket/src/racket/src/lightning/ppc/asm-common.h
+++ b/racket/src/racket/src/lightning/ppc/asm-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_asm_common_h
+#ifndef __lightning_asm_common_h_
 #define __lightning_asm_common_h_
 
 
diff --git a/racket/src/racket/src/lightning/ppc/core-common.h b/racket/src/racket/src/lightning/ppc/core-common.h
index ff64be69d7..c4c18f3009 100644
--- a/racket/src/racket/src/lightning/ppc/core-common.h
+++ b/racket/src/racket/src/lightning/ppc/core-common.h
@@ -30,7 +30,7 @@
  ***********************************************************************/
 
 
-#ifndef __lightning_core_common_h
+#ifndef __lightning_core_common_h_
 #define __lightning_core_common_h_
 
 /* jit_code: union of many possible function pointer types.  Returned
diff --git a/racket/src/racket/src/mzrt.h b/racket/src/racket/src/mzrt.h
index 8dba591bec..61fb6f6c57 100644
--- a/racket/src/racket/src/mzrt.h
+++ b/racket/src/racket/src/mzrt.h
@@ -85,6 +85,11 @@ int mzrt_sema_destroy(mzrt_sema *sema);
 
 /****************** Compare and Swap *******************************/
 
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
 #define mz_CAS_T uintptr_t
 #ifdef SIXTY_FOUR_BIT_INTEGERS
 # define mz_CAS_64
@@ -121,6 +126,11 @@ static MZ_INLINE void mzrt_ensure_max_cas(uintptr_t *atomic_val, uintptr_t len)
     }
   }
 }
+
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
+
 #endif
 
 #endif
diff --git a/racket/src/racket/src/nummacs.h b/racket/src/racket/src/nummacs.h
index 74f8a1a189..43e8500db2 100644
--- a/racket/src/racket/src/nummacs.h
+++ b/racket/src/racket/src/nummacs.h
@@ -228,10 +228,12 @@ static MZ_INLINE rettype name ## __big_dbl(const Scheme_Object *n1, const Scheme
 static MZ_INLINE rettype name ## __big_rat(const Scheme_Object *n1, const Scheme_Object *n2) { \
   return rop(scheme_integer_to_rational(n1), (n2)); \
 } \
+complexwrap(\
 static MZ_INLINE rettype name ## __big_comp(const Scheme_Object *n1, const Scheme_Object *n2) { \
   Small_Complex sc; \
   return cxop((scheme_make_small_complex(n1, &sc)), (n2)); \
 } \
+) \
 static MZ_INLINE rettype name ## __rat_int(const Scheme_Object *n1, const Scheme_Object *n2) { \
   Small_Rational sr8; \
   check_exact_zero2(n2, n1); \
diff --git a/racket/src/racket/src/regexp.c b/racket/src/racket/src/regexp.c
index 7068fca538..bff10c09d9 100644
--- a/racket/src/racket/src/regexp.c
+++ b/racket/src/racket/src/regexp.c
@@ -2360,6 +2360,7 @@ static MZ_INLINE rxpos l_strchr_ci(char *str, rxpos a, int l, int c)
   return -1;
 }
 
+#if 0
 static MZ_INLINE int in_ranges(char *str, rxpos a, int l, int c)
 {
   int i;
@@ -2389,6 +2390,7 @@ static MZ_INLINE int in_ranges_ci(char *str, rxpos a, int l, int c)
 
   return 0;
 }
+#endif
 
 /*
  * regexec and friends