Commit 85625c5e authored by Yang Tse's avatar Yang Tse
Browse files

setup-vms.h: post VMS patch cleanup - III 

- rename post-config-vms.h to setup-vms.h
- move its inclusion into proper location in curl_setup.h
parent 453e821a

lib/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -44,4 +44,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ 
  curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h	\

  curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h	        \

  hostcheck.h bundles.h conncache.h curl_setup_once.h multihandle.h     \

  post-config-vms.h
 
  setup-vms.h

lib/curl_setup.h

+8 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 


#include "curl_config.h"



/* VMS needs some helper routines/definitions */

#ifdef __VMS

#  include "post-config-vms.h"

#endif



#else /* HAVE_CONFIG_H */



#ifdef _WIN32_WCE
@@ -234,6 +229,14 @@ 
#  include "setup-os400.h"

#endif



/*

 * VMS setup file includes some system headers.

 */



#ifdef __VMS

#  include "setup-vms.h"

#endif



/*

 * Include header files for windows builds before redefining anything.

 * Use this preprocessor block only to include or exclude windows.h,

lib/post-config-vms.h→lib/setup-vms.h

+3 −3
Original line number Diff line number Diff line 
#ifndef HEADER_CONFIG_VMS_H

#define HEADER_CONFIG_VMS_H

#ifndef HEADER_CURL_SETUP_VMS_H

#define HEADER_CURL_SETUP_VMS_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -395,4 +395,4 @@ char * unix_path; 
#endif

#endif



#endif /* HEADER_CONFIG_VMS_H */
 
#endif /* HEADER_CURL_SETUP_VMS_H */