diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-11-28 05:36:32 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-11-28 05:36:32 +0300 |
| commit | 558f1fb418a6e384160f341264defedfca91680a (patch) | |
| tree | 7d15b7e994b6b0b4841d8e7dcb4f54ec5d30422f | |
| parent | 0caa03b00ac7290b0f14d3cad47da5fa5496f97c (diff) | |
* winsup.h: Reorganize to avoid use of experimental stuff.
* shortcut.cc: Move winsup.h first in include order.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/shortcut.c | 2 | ||||
| -rw-r--r-- | winsup/cygwin/winsup.h | 14 |
3 files changed, 13 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6d7c684c8..846fc5be8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2001-11-27 Christopher Faylor <cgf@redhat.com> + * winsup.h: Reorganize to avoid use of experimental stuff. + * shortcut.cc: Move winsup.h first in include order. + +2001-11-27 Christopher Faylor <cgf@redhat.com> + * cygwin.din (ualarm): New export. * dcrt0.cc (_dll_crt0): Add experimental tls storage declaration. (dll_crt0): Ditto. diff --git a/winsup/cygwin/shortcut.c b/winsup/cygwin/shortcut.c index d0c511da5..55710e86b 100644 --- a/winsup/cygwin/shortcut.c +++ b/winsup/cygwin/shortcut.c @@ -11,8 +11,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #define WIN32_LEAN_AND_MEAN -#include <shlobj.h> #include "winsup.h" +#include <shlobj.h> #include <ctype.h> #include <sys/types.h> #include <sys/mount.h> diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 85b7fbe0d..93eae3397 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -25,6 +25,13 @@ details. */ #define NO_COPY __attribute__((section(".data_cygwin_nocopy"))) +#ifdef EXPCGF +#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused)) +#else +#define DECLARE_TLS_STORAGE do {} while (0) +#define _WINBASE2_H +#endif + #ifdef __cplusplus #if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L @@ -272,11 +279,4 @@ extern HMODULE cygwin_hmodule; #define winsock_active (wsadata.wVersion < 512) extern struct WSAData wsadata; -#ifdef EXPCGF -#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused)) -#else -#define DECLARE_TLS_STORAGE do {} while (0) -#define _WINBASE2_H -#endif - #endif /* defined __cplusplus */ |