diff options
| author | dannysmith <dannysmith@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-21 22:16:08 +0000 |
|---|---|---|
| committer | dannysmith <dannysmith@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-21 22:16:08 +0000 |
| commit | 0e0719d460ba09c2fec21d358400aa47cf6fa00f (patch) | |
| tree | 0f09dde6e47b45dbeddd764b0f3f1e890d5b3cae | |
| parent | ae204ba4fd0b3f0d5bbf2848cf880f4f3ada5361 (diff) | |
| download | gcc-0e0719d460ba09c2fec21d358400aa47cf6fa00f.tar.gz | |
* gthr-win32.h (__GTHREAD_HIDE_WIN32API): Test for non-zero
value, not just if defined.
* libstdc++-v3/config/os/mingw32/os_defines.h (__GTHREAD_HIDE_WIN32API):
Define to 1 by defualt.
(NOMINMAX): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67069 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gthr-win32.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/mingw32/os_defines.h | 13 |
4 files changed, 27 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cc049d36f20..c3b71010f30 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-05-21 Danny Smith <dannysmith@users.sourceforge.net> + + * gthr-win32.h (__GTHREAD_HIDE_WIN32API): Test for non-zero + value, not just if defined. + Update copyright year. + 2003-05-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> PR target/6428 diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h index fe8743a8658..93f157481a3 100644 --- a/gcc/gthr-win32.h +++ b/gcc/gthr-win32.h @@ -1,6 +1,6 @@ /* Threads compatibility routines for libgcc2 and libobjc. */ /* Compile this one with gcc. */ -/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Mumit Khan <khan@xraylith.wisc.edu>. This file is part of GCC. @@ -365,7 +365,7 @@ __gthread_active_p (void) #endif } -#ifdef __GTHREAD_HIDE_WIN32API +#if __GTHREAD_HIDE_WIN32API /* The implementations are in config/i386/gthr-win32.c in libgcc.a. Only stubs are exposed to avoid polluting the C++ namespace with diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3a3ac682ab6..6d74521ccef 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2003-05-21 Danny Smith <dannysmith@users.sourceforge.net> + + * libstdc++-v3/config/os/mingw32/os_defines.h (__GTHREAD_HIDE_WIN32API): + Define to 1 by defualt. + (NOMINMAX): Define. + Update copyright year. + 2003-05-21 Paolo Carlini <pcarlini@unitus.it> * include/std/std_fstream.h (_M_set_buffer): Fix indentation. diff --git a/libstdc++-v3/config/os/mingw32/os_defines.h b/libstdc++-v3/config/os/mingw32/os_defines.h index 5c99e09428c..b93ad27d881 100644 --- a/libstdc++-v3/config/os/mingw32/os_defines.h +++ b/libstdc++-v3/config/os/mingw32/os_defines.h @@ -1,6 +1,6 @@ // Specific definitions for generic platforms -*- C++ -*- -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -34,4 +34,15 @@ // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. +// Define as 0, if you want, to enable inlining of gthread functions. +// By default, don't pollute libstdc++ with win32api names. +#if !defined (__GTHREAD_HIDE_WIN32API) +# define __GTHREAD_HIDE_WIN32API 1 +#endif + +// Don't let win32api windef.h define min and max as macros +// if included after stl_algobase.h. +#undef NOMINMAX +#define NOMINMAX 1 + #endif |