diff options
| author | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2000-08-22 13:31:00 +0000 |
|---|---|---|
| committer | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2000-08-22 13:31:00 +0000 |
| commit | b5b5c52034840dbfcd3f76a9e7cde8b379e7d517 (patch) | |
| tree | fdb77903d8a0bb01e28e5e465b1e751136723692 /include/GL | |
| parent | f4f4dab25a6c52d403a0b19ab28b443cda8f5730 (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 'include/GL')
| -rw-r--r-- | include/GL/glx.h | 3 | ||||
| -rw-r--r-- | include/GL/vms_x_fix.h | 43 | ||||
| -rw-r--r-- | include/GL/xmesa.h | 6 |
3 files changed, 49 insertions, 3 deletions
diff --git a/include/GL/glx.h b/include/GL/glx.h index c2ae5d35b9..9082c3dcd1 100644 --- a/include/GL/glx.h +++ b/include/GL/glx.h @@ -1,4 +1,4 @@ -/* $Id: glx.h,v 1.22 2000/06/23 17:39:18 brianp Exp $ */ +/* $Id: glx.h,v 1.23 2000/08/22 13:31:00 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -30,6 +30,7 @@ #ifdef __VMS +#include <GL/vms_x_fix.h> # ifdef __cplusplus /* VMS Xlib.h gives problems with C++. * this avoids a bunch of trivial warnings */ diff --git a/include/GL/vms_x_fix.h b/include/GL/vms_x_fix.h new file mode 100644 index 0000000000..6e4fb6806b --- /dev/null +++ b/include/GL/vms_x_fix.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * * + * Repair definitions of Xlib when compileing with /name=(as_is) on VMS * + * You'll need the PORTING_LIBRARY (get it from Compaq) installed * + * * + * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl) * + * * + * Last revision : 22 August 2000 * + * * + ***************************************************************************/ + +#ifndef VMS_X_FIX +#define VMS_X_FIX + +#ifdef __cplusplus +#define VMS_BEGIN_C_PLUS_PLUS extern "C" { +#define VMS_END_C_PLUS_PLUS } +#else +#define VMS_BEGIN_C_PLUS_PLUS +#define VMS_END_C_PLUS_PLUS +#endif + +#include <motif_redefines.h> + +#define XQueryFont XQUERYFONT +#define XSetPlaneMask XSETPLANEMASK +#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL +#define XDestroySubwindows XDESTROYSUBWINDOWS +#define XFreeDeviceList XFREEDEVICELIST +#define XFreeDeviceState XFREEDEVICESTATE +#define XGetExtensionVersion XGETEXTENSIONVERSION +#define XGetRGBColormaps XGETRGBCOLORMAPS +#define XIconifyWindow XICONIFYWINDOW +#define XInstallColormap XINSTALLCOLORMAP +#define XListInputDevices XLISTINPUTDEVICES +#define XLookupKeysym XLOOKUPKEYSYM +#define XOpenDevice XOPENDEVICE +#define XQueryDeviceState XQUERYDEVICESTATE +#define XSelectExtensionEvent XSELECTEXTENSIONEVENT +#define XWarpPointer XWARPPOINTER +#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP + +#endif diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h index 0c50b48c7c..273b83508c 100644 --- a/include/GL/xmesa.h +++ b/include/GL/xmesa.h @@ -1,4 +1,4 @@ -/* $Id: xmesa.h,v 1.8 2000/05/02 02:30:01 brianp Exp $ */ +/* $Id: xmesa.h,v 1.9 2000/08/22 13:31:01 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -67,12 +67,14 @@ See the demos/xdemo.c and xmesa1.c files for examples. #ifndef XMESA_H #define XMESA_H +#ifdef __VMS +#include <GL/vms_x_fix.h> +#endif #ifdef __cplusplus extern "C" { #endif - #ifdef XFree86Server #include "xmesa_xf86.h" #else |