* cygprops.h: Use #pragma once.

* mkglobals_h: Ditto for generated globals.h file.
* globals.cc: Use specific NO_GLOBALS_H flag to control inclusion of globals.h.
* winsup.h: Honor NO_GLOBALS_H to control inclusion of globals.h.  Make
clear_procimptoken extern inline so that it is only defined when needed.

1 files changed, 15 insertions, 15 deletions

diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 0135cf3f3..395291dc8 100644
--- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc
@@ -9,7 +9,7 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#define _GLOBALS_H 1
+#define NO_GLOBALS_H
 #include "winsup.h"
 #include "cygtls.h"
 #include "perprocess.h"
@@ -31,20 +31,20 @@ UINT system_wow64_directory_length;
 /* program exit the program */
 
 enum exit_states
-  {
-    ES_NOT_EXITING = 0,
-    ES_EXIT_STARTING,
-    ES_PROCESS_LOCKED,
-    ES_EVENTS_TERMINATE,
-    ES_SIGNAL,
-    ES_CLOSEALL,
-    ES_THREADTERM,
-    ES_HUP_PGRP,
-    ES_HUP_SID,
-    ES_EXEC_EXIT,
-    ES_TTY_TERMINATE,
-    ES_FINAL
-  };
+{
+  ES_NOT_EXITING = 0,
+  ES_EXIT_STARTING,
+  ES_PROCESS_LOCKED,
+  ES_EVENTS_TERMINATE,
+  ES_SIGNAL,
+  ES_CLOSEALL,
+  ES_THREADTERM,
+  ES_HUP_PGRP,
+  ES_HUP_SID,
+  ES_EXEC_EXIT,
+  ES_TTY_TERMINATE,
+  ES_FINAL
+};
 
 exit_states NO_COPY exit_state;