summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-08-22 13:31:00 +0000
committerJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-08-22 13:31:00 +0000
commitb5b5c52034840dbfcd3f76a9e7cde8b379e7d517 (patch)
treefdb77903d8a0bb01e28e5e465b1e751136723692 /src/mesa/drivers/x11
parentf4f4dab25a6c52d403a0b19ab28b443cda8f5730 (diff)
Committing in .
Modified Files: Mesa/include/GL/glx.h Mesa/include/GL/xmesa.h Mesa/src/descrip.mms Mesa/src/X/glxheader.h Mesa/src/X/xfonts.c Mesa/src/X/xfonts.h Mesa/src-glu/descrip.mms Mesa/src-glut/capturexfont.c Mesa/src-glut/descrip.mms Mesa/src-glut/glut_cmap.c Mesa/src-glut/glut_event.c Mesa/src-glut/glut_fullscrn.c Mesa/src-glut/glut_gamemode.c Mesa/src-glut/glut_init.c Mesa/src-glut/glut_input.c Mesa/src-glut/glut_menu.c Mesa/src-glut/glut_menu2.c Mesa/src-glut/glut_overlay.c Mesa/src-glut/glut_win.c Mesa/src-glut/glut_winmisc.c Mesa/src-glut/glutint.h Mesa/src-glut/layerutil.h Mesa/vms/analyze_map.com Added Files: Mesa/include/GL/vms_x_fix.h Patches effective on VMS only. This allows for compiling with /name=(as_is,short). This breaks the binary compatibility with previous versions for VMS, but is the only way to combine Mesa with GTK for VMS. Jouk ----------------------------------------------------------------------
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/glxheader.h5
-rw-r--r--src/mesa/drivers/x11/xfonts.c5
-rw-r--r--src/mesa/drivers/x11/xfonts.h5
3 files changed, 12 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 28e53659f0..99a6400aad 100644
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -1,4 +1,4 @@
-/* $Id: glxheader.h,v 1.1 1999/11/11 01:29:28 brianp Exp $ */
+/* $Id: glxheader.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -28,6 +28,9 @@
#ifndef GLX_HEADER_H
#define GLX_HEADER_H
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
#ifdef HAVE_CONFIG_H
#include "conf.h"
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 27b877dbab..e0f457a354 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.8 2000/08/13 03:57:21 brianp Exp $ */
+/* $Id: xfonts.c,v 1.9 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -29,6 +29,9 @@
* Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
*/
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
#ifdef HAVE_CONFIG_H
#include "conf.h"
diff --git a/src/mesa/drivers/x11/xfonts.h b/src/mesa/drivers/x11/xfonts.h
index 9cbe11f7bb..712c9d4c32 100644
--- a/src/mesa/drivers/x11/xfonts.h
+++ b/src/mesa/drivers/x11/xfonts.h
@@ -1,4 +1,4 @@
-/* $Id: xfonts.h,v 1.1 2000/04/19 01:44:02 brianp Exp $ */
+/* $Id: xfonts.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -28,6 +28,9 @@
#ifndef XFONTS_H
#define XFONTS_H
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
#include <X11/Xlib.h>