Merge https://github.com/nigels-com/glew.git into master HEAD at Sat Dec 24 17:46:36 GMT 2016

config/Makefile.darwin-gcc6

@@ -0,0 +1,30 @@
+# For building with Brew gcc:
+# $ brew install gcc
+GLEW_DEST = /usr/local
+NAME = $(GLEW_NAME)
+CC = gcc-6
+LD = gcc-6
+CFLAGS.EXTRA = -dynamic -fno-common
+CFLAGS.EXTRA += -std=c89
+# Lots of warnings with -pedantic
+# warning: ISO C forbids conversion of object pointer to function pointer type
+#CFLAGS.EXTRA += -pedantic
+#CFLAGS.EXTRA += -no-cpp-precomp
+LDFLAGS.EXTRA =
+ifneq (undefined, $(origin GLEW_APPLE_GLX))
+CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
+LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
+else
+LDFLAGS.GL = -framework OpenGL
+endif
+LDFLAGS.STATIC =
+LDFLAGS.DYNAMIC =
+WARN = -Wall -W
+POPT = -Os
+CFLAGS.EXTRA += -fPIC
+BIN.SUFFIX =
+LIB.SONAME    = lib$(NAME).$(SO_MAJOR).dylib
+LIB.DEVLNK    = lib$(NAME).dylib
+LIB.SHARED    = lib$(NAME).$(SO_VERSION).dylib
+LIB.STATIC    = lib$(NAME).a
+LDFLAGS.SO    = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)

config/Makefile.darwin-universal

@@ -1,3 +1,6 @@
+#
+# Needs to be clang toolchain for universal: -arch i386 -arch x86_64
+#
 GLEW_DEST = /usr/local
 NAME = $(GLEW_NAME)
 CC = cc

src/visualinfo.c

@@ -617,7 +617,7 @@ VisualInfo (GLContext* ctx)
 #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
 
 void
-VisualInfo (GLContext* __attribute__((__unused__)) ctx)
+VisualInfo (__attribute__((unused)) GLContext* ctx)
 {
 /*
   int attrib[] = { AGL_RGBA, AGL_NONE };