diff options
| author | Kevin E Martin <kem@kem.org> | 2004-07-30 04:44:13 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-07-30 04:44:13 +0000 |
| commit | 854c1afa867ff617b47c4cde3cfd86bd26e9931a (patch) | |
| tree | 186fa88148e4609f318237ff88e0005202c441bd | |
| parent | 71164d118c192e96eb2b0fc45514233e9563a568 (diff) | |
Fix "DoLoadableServer NO" build
| -rw-r--r-- | GL/glx/single2.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/dri/dri.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/dri/xf86dri.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 451f09ecc..4868d91a4 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -42,8 +42,8 @@ #include "g_disptab.h" #include "GL/glx_ansic.h" -#if defined(__CYGWIN__) || defined(__DARWIN__) /* should be XFree86Server */ -#define xf86atof atof +#if defined(XFree86LOADER) && !defined(__CYGWIN__) && !defined(__DARWIN__) +#define atof xf86atof #endif int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc) @@ -345,7 +345,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap) string = buf; } else if ( name == GL_VERSION ) { - if ( xf86atof( string ) > xf86atof( GLServerVersion ) ) { + if ( atof( string ) > atof( GLServerVersion ) ) { buf = __glXMalloc( __glXStrlen( string ) + __glXStrlen( GLServerVersion ) + 4 ); diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 513819e21..c81779380 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -57,6 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _XF86DRI_SERVER_ #include "xf86dristr.h" #include "swaprep.h" +#include "xf86str.h" #include "dri.h" #include "sarea.h" #include "dristruct.h" diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 201cdbac5..9ce5fb342 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -54,6 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _XF86DRI_SERVER_ #include "xf86dristr.h" #include "swaprep.h" +#include "xf86str.h" #include "dri.h" #include "sarea.h" #include "dristruct.h" |