From 506b634b780dcd23aa61015c2ceba3e687196abf Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Mon, 15 Jun 2009 22:52:34 +0000 Subject: Deleted obsolete source code in preparation for copying JOGL_2_SANDBOX on to trunk git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1958 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/stub_includes/x11/X11/Intrinsic.h | 1 - make/stub_includes/x11/X11/X.h | 35 --------------- make/stub_includes/x11/X11/Xlib.h | 1 - make/stub_includes/x11/X11/Xutil.h | 37 ---------------- make/stub_includes/x11/glxext.c | 14 ------ make/stub_includes/x11/jni.h | 78 ---------------------------------- make/stub_includes/x11/jni_md.h | 15 ------- make/stub_includes/x11/window-system.c | 63 --------------------------- 8 files changed, 244 deletions(-) delete mode 100644 make/stub_includes/x11/X11/Intrinsic.h delete mode 100644 make/stub_includes/x11/X11/X.h delete mode 100644 make/stub_includes/x11/X11/Xlib.h delete mode 100644 make/stub_includes/x11/X11/Xutil.h delete mode 100644 make/stub_includes/x11/glxext.c delete mode 100644 make/stub_includes/x11/jni.h delete mode 100644 make/stub_includes/x11/jni_md.h delete mode 100644 make/stub_includes/x11/window-system.c (limited to 'make/stub_includes/x11') diff --git a/make/stub_includes/x11/X11/Intrinsic.h b/make/stub_includes/x11/X11/Intrinsic.h deleted file mode 100644 index 558d3791b..000000000 --- a/make/stub_includes/x11/X11/Intrinsic.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/make/stub_includes/x11/X11/X.h b/make/stub_includes/x11/X11/X.h deleted file mode 100644 index 239836ee4..000000000 --- a/make/stub_includes/x11/X11/X.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _X_H_ -#define _X_H_ - -typedef struct {} * XID; -typedef int Bool; -typedef struct {} Display; -typedef int Status; -typedef struct {} Visual; -typedef unsigned long VisualID; -typedef XID Colormap; -typedef XID Cursor; -typedef XID Drawable; -typedef XID Font; -typedef XID GContext; -typedef XID KeySym; -typedef XID Pixmap; -typedef XID Window; - -typedef struct __GLXcontextRec *GLXContext; -//typedef void *GLXContext; -typedef XID GLXPixmap; -typedef XID GLXDrawable; -/* GLX 1.3 and later */ -typedef struct __GLXFBConfigRec *GLXFBConfig; -//typedef void *GLXFBConfig; -typedef XID GLXFBConfigID; -typedef XID GLXContextID; -typedef XID GLXWindow; -typedef XID GLXPbuffer; - -// Hacks for glXGetProcAddress -typedef void (*__GLXextFuncPtr)(void); -typedef unsigned char GLubyte; /* 1-byte unsigned */ - -#endif /* defined _X_H_ */ diff --git a/make/stub_includes/x11/X11/Xlib.h b/make/stub_includes/x11/X11/Xlib.h deleted file mode 100644 index 558d3791b..000000000 --- a/make/stub_includes/x11/X11/Xlib.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/make/stub_includes/x11/X11/Xutil.h b/make/stub_includes/x11/X11/Xutil.h deleted file mode 100644 index 32c8d5be5..000000000 --- a/make/stub_includes/x11/X11/Xutil.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef _XUTIL_H_ -#define _XUTIL_H_ - -#include -#include - -/* - * Information used by the visual utility routines to find desired visual - * type from the many visuals a display may support. - */ - -typedef struct { - Visual *visual; - VisualID visualid; - int screen; - int depth; - int c_class; /* C++ */ - unsigned long red_mask; - unsigned long green_mask; - unsigned long blue_mask; - int colormap_size; - int bits_per_rgb; -} XVisualInfo; - -#define VisualNoMask 0x0 -#define VisualIDMask 0x1 -#define VisualScreenMask 0x2 -#define VisualDepthMask 0x4 -#define VisualClassMask 0x8 -#define VisualRedMaskMask 0x10 -#define VisualGreenMaskMask 0x20 -#define VisualBlueMaskMask 0x40 -#define VisualColormapSizeMask 0x80 -#define VisualBitsPerRGBMask 0x100 -#define VisualAllMask 0x1FF - -#endif /* #defined _XUTIL_H_ */ diff --git a/make/stub_includes/x11/glxext.c b/make/stub_includes/x11/glxext.c deleted file mode 100644 index 67906a088..000000000 --- a/make/stub_includes/x11/glxext.c +++ /dev/null @@ -1,14 +0,0 @@ -#define GLAPI - -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. -#define GL_GLEXT_PROTOTYPES - -#include - -// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in -// "glxext.h" are parsed. -#define GLX_GLXEXT_PROTOTYPES -#include -#include -#include diff --git a/make/stub_includes/x11/jni.h b/make/stub_includes/x11/jni.h deleted file mode 100644 index be01d0187..000000000 --- a/make/stub_includes/x11/jni.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Stub header for JNI which provides needed declarations without more - complicated and unnecessary constructs */ - -/* - * JNI Types - */ - -#include "jni_md.h" - -typedef unsigned char jboolean; -typedef unsigned short jchar; -typedef short jshort; -typedef float jfloat; -typedef double jdouble; - -typedef jint jsize; - -struct _jobject; - -typedef struct _jobject *jobject; -typedef jobject jclass; -typedef jobject jthrowable; -typedef jobject jstring; -typedef jobject jarray; -typedef jarray jbooleanArray; -typedef jarray jbyteArray; -typedef jarray jcharArray; -typedef jarray jshortArray; -typedef jarray jintArray; -typedef jarray jlongArray; -typedef jarray jfloatArray; -typedef jarray jdoubleArray; -typedef jarray jobjectArray; -typedef jobject jweak; - -typedef union jvalue { - jboolean z; - jbyte b; - jchar c; - jshort s; - jint i; - jlong j; - jfloat f; - jdouble d; - jobject l; -} jvalue; - -struct _jfieldID; -typedef struct _jfieldID *jfieldID; - -struct _jmethodID; -typedef struct _jmethodID *jmethodID; - -/* - * jboolean constants - */ - -#define JNI_FALSE 0 -#define JNI_TRUE 1 - -/* - * possible return values for JNI functions. - */ - -#define JNI_OK 0 /* success */ -#define JNI_ERR (-1) /* unknown error */ -#define JNI_EDETACHED (-2) /* thread detached from the VM */ -#define JNI_EVERSION (-3) /* JNI version error */ -#define JNI_ENOMEM (-4) /* not enough memory */ -#define JNI_EEXIST (-5) /* VM already created */ -#define JNI_EINVAL (-6) /* invalid arguments */ - -/* - * used in ReleaseScalarArrayElements - */ - -#define JNI_COMMIT 1 -#define JNI_ABORT 2 diff --git a/make/stub_includes/x11/jni_md.h b/make/stub_includes/x11/jni_md.h deleted file mode 100644 index 449786272..000000000 --- a/make/stub_includes/x11/jni_md.h +++ /dev/null @@ -1,15 +0,0 @@ -#define _JNI_IMPORT_OR_EXPORT_ -#define JNIEXPORT -#define JNIIMPORT -#define JNICALL - -typedef int jint; -#ifdef _LP64 /* 64-bit Solaris */ -typedef long jlong; -#else -typedef long long jlong; -#endif - -typedef signed char jbyte; - -typedef long JNIEnv; diff --git a/make/stub_includes/x11/window-system.c b/make/stub_includes/x11/window-system.c deleted file mode 100644 index 20cb91a08..000000000 --- a/make/stub_includes/x11/window-system.c +++ /dev/null @@ -1,63 +0,0 @@ -// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in -// "glxext.h" are parsed. -#define GLX_GLXEXT_PROTOTYPES - -#include -#include -#include - -// Routines needed from Xlib.h and Xutil.h (placed here to avoid having -// XVisualInfo generated multiple times) -#ifndef _Xconst -#define _Xconst const -#endif /* _Xconst */ - -extern Display *XOpenDisplay( - _Xconst char* /* display_name */ -); - -extern XVisualInfo *XGetVisualInfo( - Display* /* display */, - long /* vinfo_mask */, - XVisualInfo* /* vinfo_template */, - int* /* nitems_return */ -); - -extern Pixmap XCreatePixmap( - Display* /* display */, - Drawable /* d */, - unsigned int /* width */, - unsigned int /* height */, - unsigned int /* depth */ -); - -extern int XFreePixmap( - Display* /* display */, - Pixmap /* pixmap */ -); - -// Helper routine for querying whether Xinerama is enabled. -Bool XineramaEnabled(Display* display); - -// Routines for changing gamma settings. -// Note that these are not currently supported on Solaris. -Bool XF86VidModeGetGammaRampSize( - Display *display, - int screen, - int* size); - -Bool XF86VidModeGetGammaRamp( - Display *display, - int screen, - int size, - unsigned short *red_array, - unsigned short *green_array, - unsigned short *blue_array); - -Bool XF86VidModeSetGammaRamp( - Display *display, - int screen, - int size, - unsigned short *red_array, - unsigned short *green_array, - unsigned short *blue_array); -- cgit v1.2.3