revert changes not intended to be pushed with commit 6b75d2c2

diff --git a/lib/setup.h b/lib/setup.h
index 69cc6d3d957a3426a2e6b4e3e1a3c582ca8d3da9..c821bc6b48952895268f631e482ee4b86fbd74a2 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -599,7 +599,7 @@ int netware_init(void);
  * Include macros and defines that should only be processed once.
  */
 
-#ifndef HEADER_CURL_SETUP_ONCE_H
+#ifndef __SETUP_ONCE_H
 #include "setup_once.h"
 #endif
 

diff --git a/lib/setup_once.h b/lib/setup_once.h
index 64cfeeaac74caf2b617f13c3a9d5df210cfd5309..fad6f321380ff1db110b095bb51c6d21a1ec6759 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CURL_SETUP_ONCE_H
-#define HEADER_CURL_SETUP_ONCE_H
+#ifndef __SETUP_ONCE_H
+#define __SETUP_ONCE_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -534,4 +534,4 @@ typedef int sig_atomic_t;
 #  endif
 #endif
 
-#endif /* HEADER_CURL_SETUP_ONCE_H */
+#endif /* __SETUP_ONCE_H */

diff --git a/src/setup.h b/src/setup.h
index 58ca0efee53041f2f74d368579bc9c88fa3c09b0..d2562a24403e5b0c426ac95e7546d74087c9153d 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -222,7 +222,7 @@ int fileno( FILE *stream);
  * Include macros and defines that should only be processed once.
  */
 
-#ifndef HEADER_CURL_SETUP_ONCE_H
+#ifndef __SETUP_ONCE_H
 #include "setup_once.h"
 #endif