diff options
| -rw-r--r-- | configs/darwin | 4 | ||||
| -rw-r--r-- | src/glx/apple/apple_glapi.c | 4 | ||||
| -rw-r--r-- | src/glx/apple/apple_xgl_api.h | 23 |
3 files changed, 9 insertions, 22 deletions
diff --git a/configs/darwin b/configs/darwin index 9d3bbcf985c..9527f61bd86 100644 --- a/configs/darwin +++ b/configs/darwin @@ -25,9 +25,9 @@ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ ARCH_FLAGS += $(RC_CFLAGS) -CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \ +CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing -fvisibility=hidden \ -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) -CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \ +CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing -fvisibility=hidden \ -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) # Library names (actual file names) diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c index 99570509888..f60cacece76 100644 --- a/src/glx/apple/apple_glapi.c +++ b/src/glx/apple/apple_glapi.c @@ -49,13 +49,9 @@ #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL" #endif -__private_extern__ struct _glapi_table * __ogl_framework_api = NULL; - -__private_extern__ struct _glapi_table * __applegl_api = NULL; -__private_extern__ void apple_xgl_init_direct(void) { static void *handle; const char *opengl_framework_path; diff --git a/src/glx/apple/apple_xgl_api.h b/src/glx/apple/apple_xgl_api.h index c6d8903a0b3..2365d64788f 100644 --- a/src/glx/apple/apple_xgl_api.h +++ b/src/glx/apple/apple_xgl_api.h @@ -29,24 +29,15 @@ #ifndef APPLE_XGL_API_H -__private_extern__ void -__applegl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, +void __applegl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); +void __applegl_glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +void __applegl_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, + GLsizei width); -__private_extern__ void -__applegl_glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +void __applegl_glDrawBuffer(GLenum mode); +void __applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs); -__private_extern__ void -__applegl_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, - GLsizei width); - -__private_extern__ void -__applegl_glDrawBuffer(GLenum mode); - -__private_extern__ void -__applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs); - -__private_extern__ void -__applegl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height); +void __applegl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height); #endif |