projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glx: Fix compilation with GLX_USE_WINDOWSGL
[mesa.git]
/
src
/
glx
/
glxcmds.c
diff --git
a/src/glx/glxcmds.c
b/src/glx/glxcmds.c
index d00c0d4816d0c098a4de84e56860f5f689f22248..bde461b43a308a877b61efad1832b89026292d8a 100644
(file)
--- a/
src/glx/glxcmds.c
+++ b/
src/glx/glxcmds.c
@@
-45,8
+45,8
@@
#include "apple/apple_glx.h"
#include "util/debug.h"
#else
#include "apple/apple_glx.h"
#include "util/debug.h"
#else
-#ifndef GLX_USE_WINDOWSGL
#include <sys/time.h>
#include <sys/time.h>
+#ifndef GLX_USE_WINDOWSGL
#include <X11/extensions/xf86vmode.h>
#endif /* GLX_USE_WINDOWSGL */
#endif
#include <X11/extensions/xf86vmode.h>
#endif /* GLX_USE_WINDOWSGL */
#endif
@@
-2083,11
+2083,12
@@
__glXGetSyncValuesOML(Display * dpy, GLXDrawable drawable,
return False;
}
return False;
}
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
&& !defined(GLX_USE_WINDOWSGL)
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
_X_HIDDEN GLboolean
__glxGetMscRate(struct glx_screen *psc,
int32_t * numerator, int32_t * denominator)
{
_X_HIDDEN GLboolean
__glxGetMscRate(struct glx_screen *psc,
int32_t * numerator, int32_t * denominator)
{
+#if !defined(GLX_USE_WINDOWSGL)
XF86VidModeModeLine mode_line;
int dot_clock;
int i;
XF86VidModeModeLine mode_line;
int dot_clock;
int i;
@@
-2134,6
+2135,7
@@
__glxGetMscRate(struct glx_screen *psc,
return True;
}
return True;
}
+#endif
return False;
}
return False;
}