summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-11 13:37:47 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-11 13:37:47 -0800
commit2a80844c38fb63103e114a2ed77cd7c734271917 (patch)
treeb1e47fd758fb0fff00d2c863379a37cca36d349a
parent83316566121745b6e1a0c3f4dbce06241ee29ecd (diff)
unifdef VMS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--include/X11/Composite.h2
-rw-r--r--include/X11/Constraint.h2
-rw-r--r--include/X11/Core.h2
-rw-r--r--include/X11/Intrinsic.h5
-rw-r--r--include/X11/Object.h2
-rw-r--r--include/X11/RectObj.h2
-rw-r--r--src/Intrinsic.c8
7 files changed, 0 insertions, 23 deletions
diff --git a/include/X11/Composite.h b/include/X11/Composite.h
index d33234f..685afc8 100644
--- a/include/X11/Composite.h
+++ b/include/X11/Composite.h
@@ -94,9 +94,7 @@ extern void XtChangeManagedSet(
_XFUNCPROTOEND
-#ifndef VMS
externalref WidgetClass compositeWidgetClass;
-#endif
#endif /* _XtComposite_h */
/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
index 20abead..5533863 100644
--- a/include/X11/Constraint.h
+++ b/include/X11/Constraint.h
@@ -52,9 +52,7 @@ _XFUNCPROTOBEGIN
typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-#ifndef VMS
externalref WidgetClass constraintWidgetClass;
-#endif
_XFUNCPROTOEND
diff --git a/include/X11/Core.h b/include/X11/Core.h
index 08a86f6..2c7dd28 100644
--- a/include/X11/Core.h
+++ b/include/X11/Core.h
@@ -54,10 +54,8 @@ typedef struct _WidgetClassRec *CoreWidgetClass;
typedef struct _WidgetRec *CoreWidget;
externalref WidgetClass coreWidgetClass;
-#ifndef VMS
externalref WidgetClass widgetClass;
-#endif
_XFUNCPROTOEND
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index 94197f9..d47bfab 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -98,13 +98,8 @@ typedef char *String;
#include <stddef.h>
-#ifdef VMS
-#define externalref globalref
-#define externaldef(psect) globaldef {"psect"} noshare
-#else
#define externalref extern
#define externaldef(psect)
-#endif /* VMS */
#ifndef FALSE
#define FALSE 0
diff --git a/include/X11/Object.h b/include/X11/Object.h
index 4be1f39..bb50048 100644
--- a/include/X11/Object.h
+++ b/include/X11/Object.h
@@ -53,9 +53,7 @@ _XFUNCPROTOBEGIN
typedef struct _ObjectRec *Object;
typedef struct _ObjectClassRec *ObjectClass;
-#ifndef VMS
externalref WidgetClass objectClass;
-#endif
_XFUNCPROTOEND
diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
index fba883a..d053108 100644
--- a/include/X11/RectObj.h
+++ b/include/X11/RectObj.h
@@ -53,9 +53,7 @@ _XFUNCPROTOBEGIN
typedef struct _RectObjRec *RectObj;
typedef struct _RectObjClassRec *RectObjClass;
-#ifndef VMS
externalref WidgetClass rectObjClass;
-#endif
_XFUNCPROTOEND
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index cbff486..7790994 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -78,9 +78,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef NO_IDENTIFY_WINDOWS
#include <X11/Xatom.h>
#endif
-#ifndef VMS
#include <sys/stat.h>
-#endif /* VMS */
#ifdef WIN32
#include <direct.h> /* for _getdrives() */
#endif
@@ -964,7 +962,6 @@ AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
static Boolean
TestFile(String path)
{
-#ifndef VMS
int ret = 0;
struct stat status;
@@ -987,9 +984,6 @@ TestFile(String path)
(status.st_mode & S_IFMT) != S_IFDIR); /* not a directory */
#endif /* X_NOT_POSIX else */
return (Boolean) ret;
-#else /* VMS */
- return TRUE; /* Who knows what to do here? */
-#endif /* VMS */
}
/* return of TRUE = resolved string fit, FALSE = didn't fit. Not
@@ -1374,14 +1368,12 @@ XtResolvePathname(Display *dpy,
LOCK_PROCESS;
pd = _XtGetPerDisplay(dpy);
if (path == NULL) {
-#ifndef VMS
if (defaultPath == NULL) {
defaultPath = getenv("XFILESEARCHPATH");
if (defaultPath == NULL)
defaultPath = impl_default;
}
path = defaultPath;
-#endif /* VMS */
}
if (path == NULL)