diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 3f20a150314aeea59cab4211a8b7f151c8b9f0e8..2eb8d4d06c181cf82632807d03636158df0951a3 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 2fdff5fd6dba905c17e0f276d1a18a73072ff995..2142d589776ebe18fb6b15ac4395062bdf34dcc8 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