[PATCH v5 10/14] opengl32: Use __wine_unix_call_fast instead of __wine_unix_call.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/opengl32/make_opengl | 3 ---
 dlls/opengl32/private.h   | 5 +++++
 dlls/opengl32/unixlib.h   | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 5654ddfa824..9bef645382d 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -1054,9 +1054,6 @@ print OUT "    GLsizei length;\n";
 print OUT "    const GLchar *message;\n";
 print OUT "};\n\n";

-print OUT "extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;\n";
-print OUT "#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )\n\n";
-
 print OUT "#endif /* __WINE_OPENGL32_UNIXLIB_H */\n";
 close OUT;

diff --git a/dlls/opengl32/private.h b/dlls/opengl32/private.h
index 06a97b43987..3b06266950b 100644
--- a/dlls/opengl32/private.h
+++ b/dlls/opengl32/private.h
@@ -28,8 +28,13 @@
 #include "winternl.h"
 #include "wingdi.h"

+#include "wine/unixlib.h"
+
 extern const void *extension_procs[] DECLSPEC_HIDDEN;

extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );

+extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;
+#define UNIX_CALL( func, params ) __wine_unix_call_fast( unixlib_handle, unix_ ## func, params )
+
 #endif /* __WINE_OPENGL32_PRIVATE_H */
diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h
index e7f21383f86..9bd22f9f874 100644
--- a/dlls/opengl32/unixlib.h
+++ b/dlls/opengl32/unixlib.h
@@ -25351,7 +25351,4 @@ struct wine_gl_debug_message_params
     const GLchar *message;
 };

-extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;
-#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )
-
 #endif /* __WINE_OPENGL32_UNIXLIB_H */