diff --git a/build/win/makeresource.sh b/build/win/makeresource.sh index fc2c583f96800..d33a1898f3276 100755 --- a/build/win/makeresource.sh +++ b/build/win/makeresource.sh @@ -56,7 +56,7 @@ cat > $RC < #include #include diff --git a/core/base/inc/RStipples.h b/core/base/inc/RStipples.h index bb44e7681c6a1..341248e77c555 100644 --- a/core/base/inc/RStipples.h +++ b/core/base/inc/RStipples.h @@ -11,7 +11,7 @@ #ifndef ROOT_Stipples #define ROOT_Stipples -#include "RConfig.h" +#include ////////////////////////////////////////////////////////////////////////// // // diff --git a/core/base/inc/Rstrstream.h b/core/base/inc/Rstrstream.h index 6ac19ab5ef456..3d059ab0bf738 100644 --- a/core/base/inc/Rstrstream.h +++ b/core/base/inc/Rstrstream.h @@ -12,7 +12,7 @@ #ifndef ROOT_Rstrstream #define ROOT_Rstrstream -#include "RConfig.h" +#include #if defined(R__ANSISTREAM) # if defined(R__SSTREAM) diff --git a/core/base/inc/RtypesCore.h b/core/base/inc/RtypesCore.h index 737f6b079da10..ed7941509c18e 100644 --- a/core/base/inc/RtypesCore.h +++ b/core/base/inc/RtypesCore.h @@ -20,7 +20,7 @@ ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include #include // size_t, NULL diff --git a/core/base/inc/Strlen.h b/core/base/inc/Strlen.h index 80ee8434f4742..085c402c6df49 100644 --- a/core/base/inc/Strlen.h +++ b/core/base/inc/Strlen.h @@ -11,7 +11,7 @@ #ifndef ROOT_Strlen #define ROOT_Strlen -#include "RConfig.h" +#include #ifdef NEED_STRING #include diff --git a/core/base/inc/TException.h b/core/base/inc/TException.h index 162cd4dd441f9..450cdd1e39a49 100644 --- a/core/base/inc/TException.h +++ b/core/base/inc/TException.h @@ -29,7 +29,7 @@ struct sigjmp_buf; struct jmp_buf; #endif -#include "RConfig.h" +#include #include "DllImport.h" struct ExceptionContext_t { diff --git a/core/base/src/String.cxx b/core/base/src/String.cxx index 0da80eb63a227..436104c0ad9fb 100644 --- a/core/base/src/String.cxx +++ b/core/base/src/String.cxx @@ -15,7 +15,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include #include #include "TBuffer.h" diff --git a/core/base/src/TDatime.cxx b/core/base/src/TDatime.cxx index bcc80ec93c720..1ef321ef448f5 100644 --- a/core/base/src/TDatime.cxx +++ b/core/base/src/TDatime.cxx @@ -24,7 +24,7 @@ date/time of data taking events and the like. If absolute time is required, use TTimeStamp. */ -#include "RConfig.h" +#include #include diff --git a/core/base/src/TROOT.cxx b/core/base/src/TROOT.cxx index 5fa2390e5dfa3..7ee4cb06e0eb5 100644 --- a/core/base/src/TROOT.cxx +++ b/core/base/src/TROOT.cxx @@ -66,7 +66,7 @@ of a main program creating an interactive version is shown below: ~~~ */ -#include "RConfig.h" +#include #include "RConfigure.h" #include "RConfigOptions.h" #include "RVersion.h" diff --git a/core/base/src/TString.cxx b/core/base/src/TString.cxx index 6d72338e8af8c..3a1d7d605de3f 100644 --- a/core/base/src/TString.cxx +++ b/core/base/src/TString.cxx @@ -35,7 +35,7 @@ as a TString, construct a TString from it, eg: ~~~ */ -#include "RConfig.h" +#include #include #include #include diff --git a/core/clib/inc/snprintf.h b/core/clib/inc/snprintf.h index 2bf88fe7cee0b..4c8c85510ec6c 100644 --- a/core/clib/inc/snprintf.h +++ b/core/clib/inc/snprintf.h @@ -10,7 +10,7 @@ #ifndef ROOT_snprintf #define ROOT_snprintf -#include "RConfig.h" +#include #include #ifndef __CINT__ diff --git a/core/clib/inc/strlcpy.h b/core/clib/inc/strlcpy.h index 6f3cbd8b2fbb9..082d012efaa2d 100644 --- a/core/clib/inc/strlcpy.h +++ b/core/clib/inc/strlcpy.h @@ -9,7 +9,7 @@ #ifndef ROOT_strlcpy #define ROOT_strlcpy -#include "RConfig.h" +#include #include "RtypesCore.h" #ifndef HAS_STRLCPY diff --git a/core/clib/res/mmconfig.h b/core/clib/res/mmconfig.h index e6b9633363be0..347c506c685d1 100644 --- a/core/clib/res/mmconfig.h +++ b/core/clib/res/mmconfig.h @@ -11,7 +11,7 @@ #ifndef MMCONFIG_H #define MMCONFIG_H -#include "RConfig.h" +#include #ifndef WIN32 # ifndef INVALID_HANDLE_VALUE diff --git a/core/clib/src/snprintf.c b/core/clib/src/snprintf.c index fcf9db18b8b34..ec898bad9254a 100644 --- a/core/clib/src/snprintf.c +++ b/core/clib/src/snprintf.c @@ -34,7 +34,7 @@ #include #include -#include "RConfig.h" /* for NEED_SNPRINTF */ +#include /* for NEED_SNPRINTF */ #if defined(NEED_SNPRINTF) || defined(SNTEST) diff --git a/core/clib/src/strlcat.c b/core/clib/src/strlcat.c index 3589b6e63fb60..cbcab1473a8cb 100644 --- a/core/clib/src/strlcat.c +++ b/core/clib/src/strlcat.c @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "RConfig.h" /* for HAS_STRLCPY */ +#include /* for HAS_STRLCPY */ #ifndef HAS_STRLCPY diff --git a/core/clib/src/strlcpy.c b/core/clib/src/strlcpy.c index b8af8a19cbdba..80bc67ce2218b 100644 --- a/core/clib/src/strlcpy.c +++ b/core/clib/src/strlcpy.c @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "RConfig.h" /* for HAS_STRLCPY */ +#include /* for HAS_STRLCPY */ #ifndef HAS_STRLCPY diff --git a/core/clingutils/src/RStl.cxx b/core/clingutils/src/RStl.cxx index 4fa12c04268db..bd97c1f1300a6 100644 --- a/core/clingutils/src/RStl.cxx +++ b/core/clingutils/src/RStl.cxx @@ -10,7 +10,7 @@ *************************************************************************/ #include "RConfigure.h" -#include "RConfig.h" +#include #include "RStl.h" #include "TClassEdit.h" diff --git a/core/clingutils/src/TClingUtils.cxx b/core/clingutils/src/TClingUtils.cxx index 920ea76fe9dae..4590cb58f4e2d 100644 --- a/core/clingutils/src/TClingUtils.cxx +++ b/core/clingutils/src/TClingUtils.cxx @@ -24,7 +24,7 @@ #include #include "RConfigure.h" -#include "RConfig.h" +#include #include "Rtypes.h" #include "RStl.h" diff --git a/core/dictgen/src/TModuleGenerator.cxx b/core/dictgen/src/TModuleGenerator.cxx index bb31bb6480fe2..1649f8860bd89 100644 --- a/core/dictgen/src/TModuleGenerator.cxx +++ b/core/dictgen/src/TModuleGenerator.cxx @@ -20,7 +20,7 @@ #include "TClingUtils.h" #include "RConfigure.h" -#include "RConfig.h" +#include #include "cling/Interpreter/CIFactory.h" #include "clang/Basic/SourceManager.h" diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx index 90b0dbed101ef..8da62153406d5 100644 --- a/core/dictgen/src/rootcling_impl.cxx +++ b/core/dictgen/src/rootcling_impl.cxx @@ -167,7 +167,7 @@ const char *rootClingHelp = #include "rootcling_impl.h" #include "RConfigure.h" -#include "RConfig.h" +#include #include #include diff --git a/core/foundation/inc/TClassEdit.h b/core/foundation/inc/TClassEdit.h index 0e4a51325e446..2d400e978aab6 100644 --- a/core/foundation/inc/TClassEdit.h +++ b/core/foundation/inc/TClassEdit.h @@ -13,7 +13,7 @@ #ifndef ROOT_TClassEdit #define ROOT_TClassEdit -#include "RConfig.h" +#include #include "RConfigure.h" #include #ifdef R__WIN32 diff --git a/core/lz4/src/ZipLZ4.cxx b/core/lz4/src/ZipLZ4.cxx index 03595cc8be117..4215c0395b590 100644 --- a/core/lz4/src/ZipLZ4.cxx +++ b/core/lz4/src/ZipLZ4.cxx @@ -16,7 +16,7 @@ #include #include -#include "RConfig.h" +#include // Pulled from liblz4; upstream library explicitly exposes the symbol but the default build // excludes the header. @@ -143,4 +143,4 @@ void R__unzipLZ4(int *srcsize, unsigned char *src, int *tgtsize, unsigned char * } *irep = returnStatus; -} \ No newline at end of file +} diff --git a/core/rootcling_stage1/src/rootcling_stage1.cxx b/core/rootcling_stage1/src/rootcling_stage1.cxx index ffb5a7ef3ae4d..cd60a9c8c0fb1 100644 --- a/core/rootcling_stage1/src/rootcling_stage1.cxx +++ b/core/rootcling_stage1/src/rootcling_stage1.cxx @@ -10,7 +10,7 @@ #include "rootcling_impl.h" #include "RConfigure.h" -#include "RConfig.h" +#include #include extern "C" { diff --git a/core/thread/inc/ThreadLocalStorage.h b/core/thread/inc/ThreadLocalStorage.h index 109943b613c5a..1c8e00eb7f77b 100644 --- a/core/thread/inc/ThreadLocalStorage.h +++ b/core/thread/inc/ThreadLocalStorage.h @@ -61,7 +61,7 @@ #include "Rtypes.h" #endif -#include "RConfig.h" +#include #include "RConfigure.h" diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx index 2e3cd2c12bf68..57e0eafadabaa 100644 --- a/core/unix/src/TUnixSystem.cxx +++ b/core/unix/src/TUnixSystem.cxx @@ -18,7 +18,7 @@ ////////////////////////////////////////////////////////////////////////// #include "RConfigure.h" -#include "RConfig.h" +#include #include "TUnixSystem.h" #include "TROOT.h" #include "TError.h" diff --git a/graf2d/mathtext/src/fontembed.cxx b/graf2d/mathtext/src/fontembed.cxx index c016b816a715b..cf38f693f9055 100644 --- a/graf2d/mathtext/src/fontembed.cxx +++ b/graf2d/mathtext/src/fontembed.cxx @@ -25,7 +25,7 @@ #endif // ROOT integration -#include "RConfig.h" +#include #ifdef R__BYTESWAP #ifndef LITTLE_ENDIAN #define LITTLE_ENDIAN 1 diff --git a/graf2d/mathtext/src/fontembedps.cxx b/graf2d/mathtext/src/fontembedps.cxx index a1ec428484080..59a9996413bed 100644 --- a/graf2d/mathtext/src/fontembedps.cxx +++ b/graf2d/mathtext/src/fontembedps.cxx @@ -25,7 +25,7 @@ #endif // ROOT integration -#include "RConfig.h" +#include #ifdef R__BYTESWAP #ifndef LITTLE_ENDIAN #define LITTLE_ENDIAN 1 diff --git a/graf2d/qt/inc/TQtRConfig.h b/graf2d/qt/inc/TQtRConfig.h index b5d3add4913e3..d06c3d044cf74 100644 --- a/graf2d/qt/inc/TQtRConfig.h +++ b/graf2d/qt/inc/TQtRConfig.h @@ -10,7 +10,7 @@ #ifndef ROOT_TQTRCONFIG #define ROOT_TQTRCONFIG -#include "RConfig.h" +#include #ifndef __CINT__ # include "qglobal.h" #endif diff --git a/io/gfal/src/TGFALFile.cxx b/io/gfal/src/TGFALFile.cxx index f235131e0f66e..c99d01b084921 100644 --- a/io/gfal/src/TGFALFile.cxx +++ b/io/gfal/src/TGFALFile.cxx @@ -44,7 +44,7 @@ Note that for the TGFALFile plugin to work, all these pathnames should be prepended by gfal:. */ -#include "RConfig.h" +#include #include "TROOT.h" #include "TUrl.h" diff --git a/io/io/src/TFile.cxx b/io/io/src/TFile.cxx index 52089f63979b9..df0f4a1cab468 100644 --- a/io/io/src/TFile.cxx +++ b/io/io/src/TFile.cxx @@ -71,7 +71,7 @@ End_Macro The structure of a directory is shown in TDirectoryFile::TDirectoryFile */ -#include "RConfig.h" +#include #ifdef R__LINUX // for posix_fadvise diff --git a/main/src/hadd.cxx b/main/src/hadd.cxx index 946cc2a4ea11d..03f2ba7181204 100644 --- a/main/src/hadd.cxx +++ b/main/src/hadd.cxx @@ -70,7 +70,7 @@ Toby Burnett implemented the possibility to use indirect files. */ -#include "RConfig.h" +#include #include "ROOT/TIOFeatures.hxx" #include #include "TFile.h" diff --git a/main/src/pmain.cxx b/main/src/pmain.cxx index efc7efe818f7d..921cbd46ef60b 100644 --- a/main/src/pmain.cxx +++ b/main/src/pmain.cxx @@ -30,7 +30,7 @@ #include #include -#include "RConfig.h" +#include #include "RConfigure.h" #ifdef R__AFS #include "TAFS.h" diff --git a/main/src/rootcling.cxx b/main/src/rootcling.cxx index 8165ce2e1293a..2d9660248a09f 100644 --- a/main/src/rootcling.cxx +++ b/main/src/rootcling.cxx @@ -12,7 +12,7 @@ #include "rootclingIO.h" #include "rootcling_impl.h" #include "RConfigure.h" -#include "RConfig.h" +#include #include "TSystem.h" extern "C" { diff --git a/misc/memstat/src/TMemStatHook.cxx b/misc/memstat/src/TMemStatHook.cxx index d357dec948c72..45f3f3736e4ae 100644 --- a/misc/memstat/src/TMemStatHook.cxx +++ b/misc/memstat/src/TMemStatHook.cxx @@ -12,7 +12,7 @@ #include // MemStat #include "TMemStatHook.h" -#include "RConfig.h" +#include // TODO: move it to a separate file #if defined(__APPLE__) diff --git a/net/net/src/TApplicationServer.cxx b/net/net/src/TApplicationServer.cxx index 7f499955082d6..1916f7bfafadf 100644 --- a/net/net/src/TApplicationServer.cxx +++ b/net/net/src/TApplicationServer.cxx @@ -19,7 +19,7 @@ ////////////////////////////////////////////////////////////////////////// #include "RConfigure.h" -#include "RConfig.h" +#include #include "Riostream.h" #ifdef WIN32 diff --git a/net/net/src/TFTP.cxx b/net/net/src/TFTP.cxx index d2957de023a93..718ecba3d4b3a 100644 --- a/net/net/src/TFTP.cxx +++ b/net/net/src/TFTP.cxx @@ -19,7 +19,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include #include #include diff --git a/net/rootd/src/rootd.cxx b/net/rootd/src/rootd.cxx index 3c7c90ec0b065..175c1b9d224a9 100644 --- a/net/rootd/src/rootd.cxx +++ b/net/rootd/src/rootd.cxx @@ -209,7 +209,7 @@ // 17 -> 18: fix problems with '//' in admin paths; partial logging in castor mode #include "RConfigure.h" -#include "RConfig.h" +#include #include #include diff --git a/net/rpdutils/src/daemon.cxx b/net/rpdutils/src/daemon.cxx index 806e50d0a465d..90151846ea8a4 100644 --- a/net/rpdutils/src/daemon.cxx +++ b/net/rpdutils/src/daemon.cxx @@ -38,7 +38,7 @@ #include #endif -#include "RConfig.h" +#include #ifndef NOFILE # define NOFILE 0 diff --git a/net/rpdutils/src/net.cxx b/net/rpdutils/src/net.cxx index 65293f524e4db..84b1fc83ef915 100644 --- a/net/rpdutils/src/net.cxx +++ b/net/rpdutils/src/net.cxx @@ -17,7 +17,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include #include #include diff --git a/net/rpdutils/src/netpar.cxx b/net/rpdutils/src/netpar.cxx index 20f77fd195d0c..206c7438aac00 100644 --- a/net/rpdutils/src/netpar.cxx +++ b/net/rpdutils/src/netpar.cxx @@ -18,7 +18,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include // avoid warning due to wrong bzero prototype (used by FD_ZERO macro) #include diff --git a/net/rpdutils/src/rpdconn.cxx b/net/rpdutils/src/rpdconn.cxx index 73051bac2b7f5..7b3a2ad0f6668 100644 --- a/net/rpdutils/src/rpdconn.cxx +++ b/net/rpdutils/src/rpdconn.cxx @@ -32,7 +32,7 @@ #include #include -#include "RConfig.h" +#include #define RPD_MAXLEN 8192 diff --git a/net/rpdutils/src/rpdutils.cxx b/net/rpdutils/src/rpdutils.cxx index 46fc517b093dc..dd9ad3afe6e6e 100644 --- a/net/rpdutils/src/rpdutils.cxx +++ b/net/rpdutils/src/rpdutils.cxx @@ -18,7 +18,7 @@ ////////////////////////////////////////////////////////////////////////// #include "RConfigure.h" -#include "RConfig.h" +#include #include #include diff --git a/net/rpdutils/src/ssh.cxx b/net/rpdutils/src/ssh.cxx index 480dd6675464d..10a547dac4082 100644 --- a/net/rpdutils/src/ssh.cxx +++ b/net/rpdutils/src/ssh.cxx @@ -15,7 +15,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include #include #include diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx index 1a3aeb913cc23..9868f9f01617f 100644 --- a/proof/proof/src/TProofServ.cxx +++ b/proof/proof/src/TProofServ.cxx @@ -20,7 +20,7 @@ master server. */ #include "RConfigure.h" -#include "RConfig.h" +#include #include "Riostream.h" #ifdef WIN32 diff --git a/proof/proof/src/TProofServLite.cxx b/proof/proof/src/TProofServLite.cxx index ae304b6d990f1..e65e77e095e85 100644 --- a/proof/proof/src/TProofServLite.cxx +++ b/proof/proof/src/TProofServLite.cxx @@ -30,7 +30,7 @@ eliminated, optimizing the number of messages exchanged and created / destroyed. ////////////////////////////////////////////////////////////////////////// #include "RConfigure.h" -#include "RConfig.h" +#include #include "Riostream.h" #ifdef WIN32 diff --git a/proof/proofd/inc/XrdProofdPlatform.h b/proof/proofd/inc/XrdProofdPlatform.h index b902a15dda376..8c468964bc351 100644 --- a/proof/proofd/inc/XrdProofdPlatform.h +++ b/proof/proofd/inc/XrdProofdPlatform.h @@ -23,7 +23,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "RConfig.h" +#include // 32 or 64 bits #if ((defined(__hpux) && defined(__LP64__)) || \ diff --git a/proof/proofd/src/proofd.cxx b/proof/proofd/src/proofd.cxx index 80aac3e581e24..6a980b907879c 100644 --- a/proof/proofd/src/proofd.cxx +++ b/proof/proofd/src/proofd.cxx @@ -155,7 +155,7 @@ // 14: add env setup message #include "RConfigure.h" -#include "RConfig.h" +#include #include #include diff --git a/proof/proofx/src/TXProofServ.cxx b/proof/proofx/src/TXProofServ.cxx index d77a1ef3f984a..46c8ab0d27f5e 100644 --- a/proof/proofx/src/TXProofServ.cxx +++ b/proof/proofx/src/TXProofServ.cxx @@ -18,7 +18,7 @@ for the underlying connection technology. */ #include "RConfigure.h" -#include "RConfig.h" +#include #include "Riostream.h" #ifdef WIN32 diff --git a/roofit/roofitcore/inc/RooFit.h b/roofit/roofitcore/inc/RooFit.h index 5b174ffb88833..240cae4db44c0 100644 --- a/roofit/roofitcore/inc/RooFit.h +++ b/roofit/roofitcore/inc/RooFit.h @@ -16,7 +16,7 @@ #ifndef ROO_FIT #define ROO_FIT -#include "RConfig.h" +#include // Global include file to fix occasional compiler issues // An error in the construction of the system and C++ header files on diff --git a/tree/tree/src/TTree.cxx b/tree/tree/src/TTree.cxx index b4512ac805ba9..e4f7103f5a94c 100644 --- a/tree/tree/src/TTree.cxx +++ b/tree/tree/src/TTree.cxx @@ -333,7 +333,7 @@ End_Macro ~~~ */ -#include "RConfig.h" +#include #include "TTree.h" #include "ROOT/TIOFeatures.hxx"