drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Christopher Faylor 2012-03-19 17:49:40 +00:00
parent 548dc6a14d
commit 374d215cca
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
2012-03-19 Christopher Faylor <me.cygwin2012@cgf.cx>
* 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.
2012-03-19 Corinna Vinschen <corinna@vinschen.de>
* thread.cc (cancelable_wait): Don't malloc tbi, just make it a struct

3
winsup/cygwin/cygprops.h
View File

@ -1,6 +1,6 @@
/* cygprops.h: Cygwin DLL properties
Copyright 2009 Red Hat, Inc.
Copyright 2009, 2012 Red Hat, Inc.
This file is part of Cygwin.
@ -8,6 +8,7 @@ This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#pragma once
/* DLL properties data. */
struct cygwin_props_t
{

30
winsup/cygwin/globals.cc
View File

@ -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;

4
winsup/cygwin/mkglobals_h
View File

@ -14,10 +14,10 @@ s/-NL-/\n/sog;
s/-EQ-/=/sog;
s/\s+\n/\n/sog;
s/\n{2,}/\n/sog;
print <<PRELUDE,$_,"#endif /*_GLOBALS_H*/\n";
print <<PRELUDE,$_;
/* $target - Autogenerated from @argv. Look there for comments. */
#ifndef _GLOBALS_H
#pragma once
PRELUDE
close $target_fd;
sub munge($) {

8
winsup/cygwin/winsup.h
View File

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