From 1f2e0dacb329aa36e16275a5f9ed0f0fd7656e9a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 31 Jul 2015 07:32:34 -0600
Subject: [PATCH] minor adjustments

SGC header correction plus extra assert.
---
 racket/src/racket/sgc/sgc.h    | 4 ++--
 racket/src/racket/src/syntax.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/racket/src/racket/sgc/sgc.h b/racket/src/racket/sgc/sgc.h
index 3432088f12..888f5fd51b 100644
--- a/racket/src/racket/sgc/sgc.h
+++ b/racket/src/racket/sgc/sgc.h
@@ -20,8 +20,8 @@ extern "C" {
 
 SGC_EXTERN void GC_add_roots(void *start, void *end);
 
-SGC_EXTERN void (*GC_start_collect_callback)(void);
-SGC_EXTERN void (*GC_end_collect_callback)(void);
+SGC_EXTERN void (*GC_collect_start_callback)(void);
+SGC_EXTERN void (*GC_collect_end_callback)(void);
 SGC_EXTERN void (*GC_custom_finalize)(void);
 SGC_EXTERN void (*GC_out_of_memory)(void);
 
diff --git a/racket/src/racket/src/syntax.c b/racket/src/racket/src/syntax.c
index 0a88a9c781..60a03d9cea 100644
--- a/racket/src/racket/src/syntax.c
+++ b/racket/src/racket/src/syntax.c
@@ -3911,6 +3911,7 @@ Scheme_Object *scheme_stx_lookup_w_nominal(Scheme_Object *o, Scheme_Object *phas
   int cache_pos;
 
   STX_ASSERT(SCHEME_STXP(o));
+  STX_ASSERT(nominal_name || (!src_phase && !nominal_src_phase));
 
   orig_name = SCHEME_STX_VAL(o);