From 118d08cd8c91a464a326b37fece3ee570359597d Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 20 Dec 2010 23:46:27 +0100 Subject: [PATCH] Fixed: Compilation under Linux --- .../src/3d/driver/opengl/driver_opengl_extension.cpp | 4 ++-- .../nel/src/3d/driver/opengl/driver_opengl_extension.h | 2 +- .../src/3d/driver/opengl/driver_opengl_extension_def.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index 404ec215a..010b26d1c 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -455,7 +455,7 @@ PFNWGLGETEXTENSIONSSTRINGARBPROC nwglGetExtensionsStringARB; #elif defined(NL_OS_MAC) #elif defined(NL_OS_UNIX) -NEL_PFNGLXLALLOCATEMEMORYNVPROC nglXAllocateMemoryNV; +NEL_PFNGLXALLOCATEMEMORYNVPROC nglXAllocateMemoryNV; NEL_PFNGLXFREEMEMORYNVPROC nglXFreeMemoryNV; // Swap control extensions @@ -591,7 +591,7 @@ static bool setupNVVertexArrayRange(const char *glext) CHECK_ADDRESS(PFNWGLALLOCATEMEMORYNVPROC, wglAllocateMemoryNV); CHECK_ADDRESS(PFNWGLFREEMEMORYNVPROC, wglFreeMemoryNV); #elif defined(NL_OS_UNIX) && !defined(NL_OS_MAC) - CHECK_ADDRESS(NEL_PFNGLXLALLOCATEMEMORYNVPROC, glXAllocateMemoryNV); + CHECK_ADDRESS(NEL_PFNGLXALLOCATEMEMORYNVPROC, glXAllocateMemoryNV); CHECK_ADDRESS(NEL_PFNGLXFREEMEMORYNVPROC, glXFreeMemoryNV); #endif diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h index 670ecd84b..f96747ab9 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h @@ -346,7 +346,7 @@ extern NEL_PFNGLVERTEXARRAYRANGENVPROC nglVertexArrayRangeNV; extern PFNWGLALLOCATEMEMORYNVPROC nwglAllocateMemoryNV; extern PFNWGLFREEMEMORYNVPROC nwglFreeMemoryNV; #elif defined(NL_OS_UNIX) && !defined(NL_OS_MAC) -extern NEL_PFNGLXLALLOCATEMEMORYNVPROC nglXAllocateMemoryNV; +extern NEL_PFNGLXALLOCATEMEMORYNVPROC nglXAllocateMemoryNV; extern NEL_PFNGLXFREEMEMORYNVPROC nglXFreeMemoryNV; #endif diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h index 906970dae..decd4a0c5 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h @@ -403,11 +403,11 @@ typedef GLint (APIENTRY * NEL_PFNGLXGETSWAPINTERVALMESAPROC) (); #endif // NL_GLX_MESA_swap_control -#ifndef NL_GLX_NV_vertex_array_range -#define NL_GLX_NV_vertex_array_range 1 -typedef void* (APIENTRY * NEL_PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); -typedef void (APIENTRY * NEL_PFNGLXFREEMEMORYNVPROC) (void *pointer); -#endif // NL_GLX_NV_vertex_array_range +#ifndef NL_GLX_NV_vertex_array_range +#define NL_GLX_NV_vertex_array_range 1 +typedef void* (APIENTRY * NEL_PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); +typedef void (APIENTRY * NEL_PFNGLXFREEMEMORYNVPROC) (void *pointer); +#endif // NL_GLX_NV_vertex_array_range #endif // NL_OS_MAC