mesa osmesa/x11: fix build error introduced in 4bea4cb9

[mesa.git] / src / mesa / drivers / x11 / glxheader.h

diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 42637f4c14d5e886882cb8c60cc06a52e97615b3..772f3fb3f498683f998bd36ccb4cf081432c1f90 100644 (file)
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5.1
  * 
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,29 +26,11 @@
 #ifndef GLX_HEADER_H
 #define GLX_HEADER_H
 
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-
-#include "glheader.h"
-
-
-#ifdef XFree86Server
-
-# include "resource.h"
-# include "windowstr.h"
-# include "gcstruct.h"
-# include "GL/xf86glx.h"
-# include "xf86glx_util.h"
+#include "main/glheader.h"
 
-#else
 
 # include <X11/Xlib.h>
+# include <X11/Xlibint.h>
 # include <X11/Xutil.h>
 # ifdef USE_XSHM  /* was SHM */
 #  include <sys/ipc.h>
@@ -57,8 +38,8 @@
 #  include <X11/extensions/XShm.h>
 # endif
 # include <GL/glx.h>
+# include <sys/time.h>
 
-#endif