OpenJDK / jdk / hs
changeset 46535:fc2445cc0e3d
8086005: Define __STDC_xxx_MACROS config macros globally via build system
Summary: Moved macro definitions to hotspot build configuration
Reviewed-by: erikj, eosterlund
| author | kbarrett |
|---|---|
| date | Tue, 13 Jun 2017 11:10:33 -0400 |
| parents | 025dfc75204d |
| children | 8f9a3ff618bd |
| files | hotspot/src/os/aix/vm/jvm_aix.h hotspot/src/os/aix/vm/loadlib_aix.cpp hotspot/src/os/bsd/vm/jvm_bsd.h hotspot/src/share/vm/utilities/globalDefinitions.hpp hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp |
| diffstat | 5 files changed, 4 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/os/aix/vm/jvm_aix.h Tue Jun 13 07:30:11 2017 -0400 +++ b/hotspot/src/os/aix/vm/jvm_aix.h Tue Jun 13 11:10:33 2017 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -40,18 +40,6 @@ * JNI conversion, which should be sorted out later. */ -// Since we are compiling with c++, we need the following to make c macros -// visible. -#if !defined(__STDC_LIMIT_MACROS) -# define __STDC_LIMIT_MACROS 1 -#endif -#if !defined(__STDC_CONSTANT_MACROS) -# define __STDC_CONSTANT_MACROS 1 -#endif -#if !defined(__STDC_FORMAT_MACROS) -# define __STDC_FORMAT_MACROS 1 -#endif - #include <dirent.h> /* For DIR */ // Must redefine NULL because the macro gets redefined to int 0
--- a/hotspot/src/os/aix/vm/loadlib_aix.cpp Tue Jun 13 07:30:11 2017 -0400 +++ b/hotspot/src/os/aix/vm/loadlib_aix.cpp Tue Jun 13 11:10:33 2017 -0400 @@ -1,4 +1,5 @@ /* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2015 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -30,10 +31,6 @@ // http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp // ?topic=/com.ibm.aix.basetechref/doc/basetrf1/loadquery.htm -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "loadlib_aix.hpp" #include "misc_aix.hpp" #include "porting_aix.hpp"
--- a/hotspot/src/os/bsd/vm/jvm_bsd.h Tue Jun 13 07:30:11 2017 -0400 +++ b/hotspot/src/os/bsd/vm/jvm_bsd.h Tue Jun 13 11:10:33 2017 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,21 +40,6 @@ * This file is currently collecting system-specific dregs for the * JNI conversion, which should be sorted out later. */ -#ifdef __NetBSD__ -/* - * Since we are compiling with c++, we need the following to make c macros - * visible. - */ -# if !defined(__STDC_LIMIT_MACROS) -# define __STDC_LIMIT_MACROS 1 -# endif -# if !defined(__STDC_CONSTANT_MACROS) -# define __STDC_CONSTANT_MACROS 1 -# endif -# if !defined(__STDC_FORMAT_MACROS) -# define __STDC_FORMAT_MACROS 1 -# endif -#endif #include <dirent.h> /* For DIR */ #include <sys/param.h> /* For MAXPATHLEN */
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Tue Jun 13 07:30:11 2017 -0400 +++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Tue Jun 13 11:10:33 2017 -0400 @@ -25,10 +25,6 @@ #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #ifdef TARGET_COMPILER_gcc # include "utilities/globalDefinitions_gcc.hpp" #endif
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Jun 13 07:30:11 2017 -0400 +++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Jun 13 11:10:33 2017 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,9 +69,6 @@ # endif #if defined(LINUX) || defined(_ALLBSD_SOURCE) -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif // __STDC_LIMIT_MACROS #include <inttypes.h> #include <signal.h> #ifndef __OpenBSD__