#include ROOT/RConfig.h instead of RConfig.h

evheniyt · Feb 6, 2018 · 190ac06 · 190ac06
1 parent c566d0d
commit 190ac06
Show file tree

Hide file tree

Showing 50 changed files with 51 additions and 51 deletions.
diff --git a/build/win/makeresource.sh b/build/win/makeresource.sh
@@ -56,7 +56,7 @@ cat > $RC <<EOF
 // ROOT version resource file for $FILENAME
 // Generated by $0 on $DATE
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include <windows.h>
 #include <winver.h>
 

diff --git 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 <ROOT/RConfig.h>
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //

diff --git 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 <ROOT/RConfig.h>
 
 #if defined(R__ANSISTREAM)
 #  if defined(R__SSTREAM)

diff --git a/core/base/inc/RtypesCore.h b/core/base/inc/RtypesCore.h
@@ -20,7 +20,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <stddef.h> // size_t, NULL
 

diff --git 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 <ROOT/RConfig.h>
 
 #ifdef NEED_STRING
 #include <string.h>

diff --git 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 <ROOT/RConfig.h>
 #include "DllImport.h"
 
 struct ExceptionContext_t {

diff --git a/core/base/src/String.cxx b/core/base/src/String.cxx
@@ -15,7 +15,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include <string>
 #include "TBuffer.h"
 

diff --git 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 <ROOT/RConfig.h>
 
 #include <time.h>
 

diff --git 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 <ROOT/RConfig.h>
 #include "RConfigure.h"
 #include "RConfigOptions.h"
 #include "RVersion.h"

diff --git 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 <ROOT/RConfig.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <list>

diff --git 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 <ROOT/RConfig.h>
 #include <stdio.h>
 
 #ifndef __CINT__

diff --git 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 <ROOT/RConfig.h>
 #include "RtypesCore.h"
 
 #ifndef HAS_STRLCPY

diff --git 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 <ROOT/RConfig.h>
 
 #ifndef WIN32
 #  ifndef INVALID_HANDLE_VALUE

diff --git a/core/clib/src/snprintf.c b/core/clib/src/snprintf.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "RConfig.h"            /* for NEED_SNPRINTF */
+#include <ROOT/RConfig.h>            /* for NEED_SNPRINTF */
 
 #if defined(NEED_SNPRINTF) || defined(SNTEST)
 

diff --git 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 <ROOT/RConfig.h>            /* for HAS_STRLCPY */
 
 #ifndef HAS_STRLCPY
 

diff --git 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 <ROOT/RConfig.h>            /* for HAS_STRLCPY */
 
 #ifndef HAS_STRLCPY
 

diff --git a/core/clingutils/src/RStl.cxx b/core/clingutils/src/RStl.cxx
@@ -10,7 +10,7 @@
  *************************************************************************/
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include "RStl.h"
 #include "TClassEdit.h"

diff --git a/core/clingutils/src/TClingUtils.cxx b/core/clingutils/src/TClingUtils.cxx
@@ -24,7 +24,7 @@
 #include <unordered_set>
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include "Rtypes.h"
 
 #include "RStl.h"

diff --git 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 <ROOT/RConfig.h>
 
 #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
@@ -167,7 +167,7 @@ const char *rootClingHelp =
 #include "rootcling_impl.h"
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <iostream>
 #include <iomanip>

diff --git 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 <ROOT/RConfig.h>
 #include "RConfigure.h"
 #include <stdlib.h>
 #ifdef R__WIN32

diff --git a/core/lz4/src/ZipLZ4.cxx b/core/lz4/src/ZipLZ4.cxx
@@ -16,7 +16,7 @@
 #include <cstdint>
 #include <cstring>
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 // 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;
-}
+}
diff --git 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 <ROOT/RConfig.h>
 #include <stdlib.h>
 
 extern "C" {

diff --git a/core/thread/inc/ThreadLocalStorage.h b/core/thread/inc/ThreadLocalStorage.h
@@ -61,7 +61,7 @@
 #include "Rtypes.h"
 #endif
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include "RConfigure.h"
 

diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx
@@ -18,7 +18,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include "TUnixSystem.h"
 #include "TROOT.h"
 #include "TError.h"

diff --git a/graf2d/mathtext/src/fontembed.cxx b/graf2d/mathtext/src/fontembed.cxx
@@ -25,7 +25,7 @@
 #endif
 
 // ROOT integration
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #ifdef R__BYTESWAP
 #ifndef LITTLE_ENDIAN
 #define LITTLE_ENDIAN 1

diff --git a/graf2d/mathtext/src/fontembedps.cxx b/graf2d/mathtext/src/fontembedps.cxx
@@ -25,7 +25,7 @@
 #endif
 
 // ROOT integration
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #ifdef R__BYTESWAP
 #ifndef LITTLE_ENDIAN
 #define LITTLE_ENDIAN 1

diff --git 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 <ROOT/RConfig.h>
 #ifndef __CINT__
 #  include "qglobal.h"
 #endif

diff --git 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 <ROOT/RConfig.h>
 #include "TROOT.h"
 #include "TUrl.h"
 

diff --git 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 <ROOT/RConfig.h>
 
 #ifdef R__LINUX
 // for posix_fadvise

diff --git 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 <ROOT/RConfig.h>
 #include "ROOT/TIOFeatures.hxx"
 #include <string>
 #include "TFile.h"

diff --git a/main/src/pmain.cxx b/main/src/pmain.cxx
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include "RConfigure.h"
 #ifdef R__AFS
 #include "TAFS.h"

diff --git 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 <ROOT/RConfig.h>
 #include "TSystem.h"
 
 extern "C" {

diff --git a/misc/memstat/src/TMemStatHook.cxx b/misc/memstat/src/TMemStatHook.cxx
@@ -12,7 +12,7 @@
 #include <iostream>
 // MemStat
 #include "TMemStatHook.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 // TODO: move it to a separate file
 #if defined(__APPLE__)

diff --git a/net/net/src/TApplicationServer.cxx b/net/net/src/TApplicationServer.cxx
@@ -19,7 +19,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 #include "Riostream.h"
 
 #ifdef WIN32

diff --git a/net/net/src/TFTP.cxx b/net/net/src/TFTP.cxx
@@ -19,7 +19,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <fcntl.h>
 #include <errno.h>

diff --git 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 <ROOT/RConfig.h>
 
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/net/rpdutils/src/daemon.cxx b/net/rpdutils/src/daemon.cxx
@@ -38,7 +38,7 @@
 #include <sys/wait.h>
 #endif
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #ifndef NOFILE
 #   define NOFILE 0

diff --git a/net/rpdutils/src/net.cxx b/net/rpdutils/src/net.cxx
@@ -17,7 +17,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/net/rpdutils/src/netpar.cxx b/net/rpdutils/src/netpar.cxx
@@ -18,7 +18,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 // avoid warning due to wrong bzero prototype (used by FD_ZERO macro)
 #include <stdio.h>

diff --git a/net/rpdutils/src/rpdconn.cxx b/net/rpdutils/src/rpdconn.cxx
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #define RPD_MAXLEN 8192
 

diff --git a/net/rpdutils/src/rpdutils.cxx b/net/rpdutils/src/rpdutils.cxx
@@ -18,7 +18,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "RConfigure.h"
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/net/rpdutils/src/ssh.cxx b/net/rpdutils/src/ssh.cxx
@@ -15,7 +15,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfig.h"
+#include <ROOT/RConfig.h>
 
 #include <stdio.h>
 #include <string.h>