diff --git a/ompi/contrib/vt/vt/extlib/otf/Makefile.am b/ompi/contrib/vt/vt/extlib/otf/Makefile.am index 898d114113..00139bb157 100644 --- a/ompi/contrib/vt/vt/extlib/otf/Makefile.am +++ b/ompi/contrib/vt/vt/extlib/otf/Makefile.am @@ -11,4 +11,4 @@ SUBDIRS = \ docu EXTRA_DIST= \ - otf_vc05.sln + otf_vc08.sln diff --git a/ompi/contrib/vt/vt/extlib/otf/otf_vc05.sln b/ompi/contrib/vt/vt/extlib/otf/otf_vc05.sln deleted file mode 100644 index 02cc2d0777..0000000000 --- a/ompi/contrib/vt/vt/extlib/otf/otf_vc05.sln +++ /dev/null @@ -1,56 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotf", "otflib\libotf_vs05.vcproj", "{6B9B49C9-75CD-400D-B736-5EACA04D0A82}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfaux", "tools\otfaux\otfaux_vs05.vcproj", "{24587836-ED5E-49DF-A7AD-419FDC208C08}" - ProjectSection(ProjectDependencies) = postProject - {6B9B49C9-75CD-400D-B736-5EACA04D0A82} = {6B9B49C9-75CD-400D-B736-5EACA04D0A82} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfcompress", "tools\otfcompress\otfcompress_vs05.vcproj", "{B6BBC220-1492-4BEA-A299-9D062133ABAA}" - ProjectSection(ProjectDependencies) = postProject - {6B9B49C9-75CD-400D-B736-5EACA04D0A82} = {6B9B49C9-75CD-400D-B736-5EACA04D0A82} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfdump", "tools\otfdump\otfdump_vs05.vcproj", "{508A823C-8EAB-4C56-9DFE-4D85B0D24491}" - ProjectSection(ProjectDependencies) = postProject - {6B9B49C9-75CD-400D-B736-5EACA04D0A82} = {6B9B49C9-75CD-400D-B736-5EACA04D0A82} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfmerge", "tools\otfmerge\otfmerge_vs05.vcproj", "{1B9223C8-DE20-4538-8214-776C6017D22B}" - ProjectSection(ProjectDependencies) = postProject - {6B9B49C9-75CD-400D-B736-5EACA04D0A82} = {6B9B49C9-75CD-400D-B736-5EACA04D0A82} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|Win32.Build.0 = Debug|Win32 - {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release|Win32.ActiveCfg = Release|Win32 - {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release|Win32.Build.0 = Release|Win32 - {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|Win32.ActiveCfg = Debug|Win32 - {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|Win32.Build.0 = Debug|Win32 - {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release|Win32.ActiveCfg = Release|Win32 - {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release|Win32.Build.0 = Release|Win32 - {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|Win32.Build.0 = Debug|Win32 - {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release|Win32.ActiveCfg = Release|Win32 - {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release|Win32.Build.0 = Release|Win32 - {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|Win32.ActiveCfg = Debug|Win32 - {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|Win32.Build.0 = Debug|Win32 - {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release|Win32.ActiveCfg = Release|Win32 - {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release|Win32.Build.0 = Release|Win32 - {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|Win32.ActiveCfg = Debug|Win32 - {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|Win32.Build.0 = Debug|Win32 - {1B9223C8-DE20-4538-8214-776C6017D22B}.Release|Win32.ActiveCfg = Release|Win32 - {1B9223C8-DE20-4538-8214-776C6017D22B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln b/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln new file mode 100644 index 0000000000..81363dba96 --- /dev/null +++ b/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln @@ -0,0 +1,66 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotf", "otflib\libotf_vs08.vcproj", "{6B9B49C9-75CD-400D-B736-5EACA04D0A82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfaux", "tools\otfaux\otfaux_vs08.vcproj", "{24587836-ED5E-49DF-A7AD-419FDC208C08}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfcompress", "tools\otfcompress\otfcompress_vs08.vcproj", "{B6BBC220-1492-4BEA-A299-9D062133ABAA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfdump", "tools\otfdump\otfdump_vs08.vcproj", "{508A823C-8EAB-4C56-9DFE-4D85B0D24491}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otfmerge", "tools\otfmerge\otfmerge_vs08.vcproj", "{1B9223C8-DE20-4538-8214-776C6017D22B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release Static|Win32 = Release Static|Win32 + Release Static|x64 = Release Static|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|Win32.Build.0 = Debug|Win32 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|x64.ActiveCfg = Debug|x64 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Debug|x64.Build.0 = Debug|x64 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release Static|Win32.Build.0 = Release Static|Win32 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release Static|x64.ActiveCfg = Release Static|x64 + {6B9B49C9-75CD-400D-B736-5EACA04D0A82}.Release Static|x64.Build.0 = Release Static|x64 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|Win32.ActiveCfg = Debug|Win32 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|Win32.Build.0 = Debug|Win32 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|x64.ActiveCfg = Debug|x64 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Debug|x64.Build.0 = Debug|x64 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release Static|Win32.Build.0 = Release Static|Win32 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release Static|x64.ActiveCfg = Release Static|x64 + {24587836-ED5E-49DF-A7AD-419FDC208C08}.Release Static|x64.Build.0 = Release Static|x64 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|Win32.Build.0 = Debug|Win32 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|x64.ActiveCfg = Debug|x64 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Debug|x64.Build.0 = Debug|x64 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release Static|Win32.Build.0 = Release Static|Win32 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release Static|x64.ActiveCfg = Release Static|x64 + {B6BBC220-1492-4BEA-A299-9D062133ABAA}.Release Static|x64.Build.0 = Release Static|x64 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|Win32.ActiveCfg = Debug|Win32 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|Win32.Build.0 = Debug|Win32 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|x64.ActiveCfg = Debug|x64 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Debug|x64.Build.0 = Debug|x64 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release Static|Win32.Build.0 = Release Static|Win32 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release Static|x64.ActiveCfg = Release Static|x64 + {508A823C-8EAB-4C56-9DFE-4D85B0D24491}.Release Static|x64.Build.0 = Release Static|x64 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|Win32.Build.0 = Debug|Win32 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|x64.ActiveCfg = Debug|x64 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Debug|x64.Build.0 = Debug|x64 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Release Static|Win32.Build.0 = Release Static|Win32 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Release Static|x64.ActiveCfg = Release Static|x64 + {1B9223C8-DE20-4538-8214-776C6017D22B}.Release Static|x64.Build.0 = Release Static|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am b/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am index 3e2eef9b06..96c029f787 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am @@ -49,7 +49,7 @@ libotf_la_SOURCES = \ EXTRA_DIST = \ OTF_Platform_win.h \ OTF_inttypes_win.h \ - libotf_vs05.vcproj + libotf_vs08.vcproj .PHONY: doc diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c index 2e31bc3aff..10d5d20796 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h index ab60a6583e..40d708a1cd 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h @@ -124,10 +124,10 @@ #define OTF_COUNTER_VARTYPE_ISUNSIGNED(x) ((x&32) == 0) #define OTF_COUNTER_VARTYPE_BITS 480 /* 1111xxxxx */ -#define OTF_COUNTER_VARTYPE_UNSIGNED8 0 /* 0000 */ -#define OTF_COUNTER_VARTYPE_SIGNED8 32 /* 00001 */ -#define OTF_COUNTER_VARTYPE_UNSIGNED4 64 /* 0010 */ -#define OTF_COUNTER_VARTYPE_SIGNED4 96 /* 0011 */ +#define OTF_COUNTER_VARTYPE_UNSIGNED8 0 /* 0000 */ +#define OTF_COUNTER_VARTYPE_SIGNED8 32 /* 0001 */ +#define OTF_COUNTER_VARTYPE_UNSIGNED4 64 /* 0010 */ +#define OTF_COUNTER_VARTYPE_SIGNED4 96 /* 0011 */ #define OTF_COUNTER_VARTYPE_UNSIGNED2 128 /* 0100 */ #define OTF_COUNTER_VARTYPE_SIGNED2 160 /* 0101 */ #define OTF_COUNTER_VARTYPE_FLOAT 256 /* 1000 */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c index 5b999078e7..b0356d65f8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c @@ -12,7 +12,10 @@ included AFTER this macro definitions */ #define _LARGEFILE64_SOURCE #define _LARGE_FILES + +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c index bb11980235..7885b30cc9 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c index b1f6f2bf64..3b33bd1d6c 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c index 10de140f13..9f44e26c7f 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c index 6605da416c..3773214f13 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" @@ -234,7 +236,7 @@ int OTF_Reader_readFunctionGroupSummary( OTF_RBuffer* buffer, appropriate handler.*/ int OTF_Reader_readMessageSummary( OTF_RBuffer* buffer, OTF_HandlerArray* handlers ); - + /** This function reads a SUMFILEOPERATION record from buffer, parse the parameter of the record and call the appropriate handler.*/ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h index 0ee056863c..ea7e2b9d03 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h @@ -15,7 +15,9 @@ #ifndef OTF_PLATFORM_UNIX_H #define OTF_PLATFORM_UNIX_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #if defined(HAVE_FSEEKO) && HAVE_FSEEKO diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h index c763941098..c6a7f1de92 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h @@ -22,6 +22,7 @@ extern "C" { #if defined(_MSC_VER) /* visual studio */ # define HAVE_IO_H +# define HAVE_ZLIB # define OTF_ftell (uint64_t) _ftelli64 # define OTF_fseek(f,off,orig) _fseeki64(f,(__int64)off,orig) diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c index 7f4d9a06e9..c15b4c91e1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c index 6c71ed46e9..e00816454d 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c index 4c31607bd4..d9718953a7 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c index 70d0c0ced7..81cfe1869c 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c index 5dde5a1e04..74dd69ea5a 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c index 53459d8b11..578a2a9b6e 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs05.vcproj b/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs08.vcproj similarity index 65% rename from ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs05.vcproj rename to ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs08.vcproj index c82ebf7d14..2ec74eeb35 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs05.vcproj +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs08.vcproj @@ -1,16 +1,20 @@  + @@ -79,9 +83,9 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h index 761e538130..f1a5240b26 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h @@ -6,7 +6,9 @@ #ifndef OTFTOVTF3_HANDLER_H #define OTFTOVTF3_HANDLER_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "OTF_inttypes.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h index 5985ce1d78..0e458484f8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h @@ -6,7 +6,9 @@ #ifndef OTFTOVTF3_TREEHASH_H #define OTFTOVTF3_TREEHASH_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c index 387a486340..e98af4c8b5 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h index c24c566c04..eddcb820ca 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h @@ -6,7 +6,10 @@ #ifndef CONTROL_H #define CONTROL_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h index ae3d076941..726cc6e1ca 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h @@ -6,7 +6,10 @@ #ifndef OTFTOVTF3_HANDLER_H #define OTFTOVTF3_HANDLER_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include "OTF_inttypes.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am index 482bbe153d..638093b465 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am @@ -20,5 +20,5 @@ otfaux_SOURCES = \ State.cpp EXTRA_DIST = \ - otfaux_vs05.vcproj + otfaux_vs08.vcproj diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h index b951b93d1b..d89daf44e4 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h @@ -6,7 +6,9 @@ #ifndef STATE_H #define STATE_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp index 87145badbc..a30a3729d4 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs05.vcproj b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs08.vcproj similarity index 51% rename from ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs05.vcproj rename to ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs08.vcproj index 124dca96f2..ba8a1dbf8c 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs05.vcproj +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs08.vcproj @@ -1,16 +1,20 @@ + @@ -65,6 +69,8 @@ AdditionalLibraryDirectories="" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> + + + + + + + + + + + + + + + + + + @@ -118,12 +199,12 @@ + + + + + + + + + + + + + + + + + + + @@ -66,6 +70,8 @@ AdditionalLibraryDirectories="" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> + + + + + + + + + + + + + + + + + + @@ -119,12 +201,12 @@ + + + + + + + + + + + + + + + + + + + @@ -64,6 +68,8 @@ LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> + + + + + + + + + + + + + + + + + + @@ -117,12 +197,12 @@ + + + + + + + + + + + + + + + + + + diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs05.vcproj b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs08.vcproj similarity index 51% rename from ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs05.vcproj rename to ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs08.vcproj index 6e94fb5c6c..4673cb81d0 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs05.vcproj +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge_vs08.vcproj @@ -1,16 +1,20 @@ + @@ -66,6 +70,8 @@ AdditionalLibraryDirectories="" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> + + + + + + + + + + + + + + + + + + @@ -119,12 +201,12 @@ + + + + + + + + + + + + + + + + + + diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h index 6aead55b71..c2131253f7 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h @@ -6,7 +6,10 @@ #ifndef HASH_H #define HASH_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include "OTF_inttypes.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c index 5901db157b..84b589fc58 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c index f6fc0449e6..95b6df0265 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c @@ -3,7 +3,9 @@ Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include