diff --git a/Makefile b/Makefile
index f731d70..9304a0e 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin)
 NAME = GLEW
 CC = cc
 LD = cc
-CFLAGS.EXTRA = -no-cpp-precomp -dynamic -I/usr/X11R6/include
+CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common -I/usr/X11R6/include
 LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED)
 LDFLAGS.EXTRA = -L/usr/X11R6/lib
 ifneq (undefined, $(origin GLEW_APPLE_GLX))
diff --git a/auto/src/glewinfo_post.c b/auto/src/glewinfo_post.c
index 6fbfa72..78b8a64 100644
--- a/auto/src/glewinfo_post.c
+++ b/auto/src/glewinfo_post.c
@@ -104,7 +104,7 @@ HWND wnd = NULL;
 HDC dc = NULL;
 HGLRC rc = NULL;
 
-GLboolean glewCreateContext (const char* display, int* visual)
+GLboolean glewCreateContext (int* visual)
 {
   WNDCLASS wc;
   PIXELFORMATDESCRIPTOR pfd;
@@ -158,7 +158,7 @@ void glewDestroyContext ()
 
 AGLContext ctx, octx;
 
-GLboolean glewCreateContext (const char* display, int* visual)
+GLboolean glewCreateContext ()
 {
   int attrib[] = { AGL_RGBA, AGL_NONE };
   AGLPixelFormat pf;