From 65f44365662e4186c83738f45fc3da268660dd0d Mon Sep 17 00:00:00 2001 From: Patrik Stridvall <ps@leissner.se> Date: Wed, 2 Oct 2002 01:24:27 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/urlmon/umon.c | 4 ++-- graphics/x11drv/opengl.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 3f20a150314..2eb8d4d06c1 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -882,7 +882,7 @@ HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, /*IInternetSession*/voi * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. * */ -HRESULT FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, +HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, LPWSTR* ppwzMimeOut, DWORD dwReserved) { @@ -968,7 +968,7 @@ HRESULT WINAPI RevokeBindStatusCallback( * Releases the resources used by the specified BINDINFO structure * */ -void ReleaseBindInfo(BINDINFO* pbindinfo) +void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) { FIXME("stub\n"); } diff --git a/graphics/x11drv/opengl.c b/graphics/x11drv/opengl.c index 2fdff5fd6db..2142d589776 100644 --- a/graphics/x11drv/opengl.c +++ b/graphics/x11drv/opengl.c @@ -38,8 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); #undef WINAPI #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#include <GL/gl.h> -#include <GL/glx.h> +#ifdef HAVE_GL_GL_H +# include <GL/gl.h> +#endif +#ifdef HAVE_GL_GLX_H +# include <GL/glx.h> +#endif #ifdef HAVE_GL_GLEXT_H # include <GL/glext.h> #endif -- GitLab