Marty Kuhrt's adjustments for a cleaner VMS build

diff --git a/lib/setup.h b/lib/setup.h
index 2aeb16f..11e137f 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -46,10 +46,6 @@
 #endif
 #endif
 
-#ifdef VMS
-/* hand-modified VMS config.h! */
-#include "config-vms.h"
-#endif
 #ifdef NETWARE
 /* hand-modified NetWare config.h! */
 #include "config-netware.h"
@@ -134,12 +130,8 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
 #endif
 
 #ifndef STDC_HEADERS /* no standard C headers! */
-#ifdef VMS
-#include "../include/curl/stdcheaders.h"
-#else
 #include <curl/stdcheaders.h>
 #endif
-#endif
 
 #if defined(CURLDEBUG) && defined(HAVE_ASSERT_H)
 #define NDEBUG
@@ -276,10 +268,6 @@ typedef struct hostent Curl_addrinfo;
 typedef struct in_addr Curl_ipconnect;
 #endif
 
-#ifdef VMS
-#define IOCTL_3_ARGS
-#endif
-
 #ifdef mpeix
 #define IOCTL_3_ARGS
 #endif

diff --git a/src/setup.h b/src/setup.h
index 135cd98..7ee7780 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -31,11 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#ifdef VMS
-#include "config-vms.h"
-#else
 #include "config.h" /* the configure script results */
-#endif
 #else
 #ifdef WIN32
 /* include the hand-modified win32 adjusted config.h! */