diff options
author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 19:23:14 +0000 |
---|---|---|
committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 19:23:14 +0000 |
commit | 604a7bee4d5ec7424ef71f094c2f4232f606b995 (patch) | |
tree | 93d15c5b39bcdda79ee28a842b5e70109528ca5d /base/port.h | |
parent | 8399598fbbd3da606e0fef699fa50a439cde5f81 (diff) | |
download | chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.zip chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.tar.gz chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.tar.bz2 |
Back out r736 due to breakage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/port.h')
-rw-r--r-- | base/port.h | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/base/port.h b/base/port.h index 885e526..12b2a90 100644 --- a/base/port.h +++ b/base/port.h @@ -27,10 +27,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef BASE_PORT_H_ -#define BASE_PORT_H_ +#ifndef BASE_PORT_H__ +#define BASE_PORT_H__ -#include <stdarg.h> #include "build/build_config.h" #ifdef COMPILER_MSVC @@ -57,22 +56,4 @@ #define GG_UINT32_C(x) (x ## U) #define GG_UINT64_C(x) GG_ULONGLONG(x) -namespace base { - -// It's possible for functions that use a va_list, such as StringPrintf, to -// invalidate the data in it upon use. The fix is to make a copy of the -// structure before using it and use that copy instead. va_copy is provided -// for this purpose. MSVC does not provide va_copy, so define an -// implementation here. It is not guaranteed that assignment is a copy, so the -// StringUtil.VariableArgsFunc unit test tests this capability. -inline void va_copy(va_list& a, va_list& b) { -#if defined(COMPILER_GCC) - ::va_copy(a, b); -#elif defined(COMPILER_MSVC) - a = b; -#endif -} - -} // namespace base - -#endif // BASE_PORT_H_ +#endif // BASE_PORT_H__ |