revert changes not intended to be pushed with commit 6b75d2c2

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
 

lib/setup_once.h

-#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 */

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