diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-03-19 21:49:40 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-03-19 21:49:40 +0400 |
| commit | 374d215ccadb50bcff6d54e9e7fdbeae9e471624 (patch) | |
| tree | 75f45a1c89554d09019795b81189bc435228408e /winsup/cygwin/winsup.h | |
| parent | 548dc6a14d286383a094eb5f2689aabdeefda73f (diff) | |
* 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.
Diffstat (limited to 'winsup/cygwin/winsup.h')
| -rw-r--r-- | winsup/cygwin/winsup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index c2f015148..ddbe360e4 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -298,9 +298,10 @@ extern "C" char _data_start__, _data_end__, _bss_start__, _bss_end__; extern "C" void (*__CTOR_LIST__) (void); extern "C" void (*__DTOR_LIST__) (void); -#if !defined(_GLOBALS_H) +#ifndef NO_GLOBALS_H #include "globals.h" -inline void clear_procimptoken () + +extern inline void clear_procimptoken () { if (hProcImpToken) { @@ -309,6 +310,5 @@ inline void clear_procimptoken () CloseHandle (old_procimp); } } -#endif - +#endif /*NO_GLOBALS_H*/ #endif /* defined __cplusplus */ |