From 74c3725e0eed2b95ed43c7671e91b34366d746fa Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Sun, 29 Sep 2024 14:48:05 -0300 Subject: [PATCH] perf.h: a public file that depends on private file should not be a public file --- builds/install/arch-specific/solaris/CS/prototype.in | 1 - builds/install/arch-specific/solaris/SS/prototype.in | 1 - builds/install/arch-specific/solx86gcc/CS/prototype.in | 1 - .../install/arch-specific/win32/BuildExecutableInstall.bat | 1 - builds/posix/Makefile.in | 1 - builds/win32/make_all.bat | 1 - src/CMakeLists.txt | 1 - src/yvalve/perf.h | 6 +++--- 8 files changed, 3 insertions(+), 10 deletions(-) diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in index 2f0ed15bd6..8f63d5dc0e 100644 --- a/builds/install/arch-specific/solaris/CS/prototype.in +++ b/builds/install/arch-specific/solaris/CS/prototype.in @@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2 d none @prefix@/include 0751 firebird firebird f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0444 firebird firebird -f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0444 firebird firebird f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0444 firebird firebird f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0444 firebird firebird diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in index 4f3e4afa34..110ee9887f 100644 --- a/builds/install/arch-specific/solaris/SS/prototype.in +++ b/builds/install/arch-specific/solaris/SS/prototype.in @@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2 d none @prefix@/include 0755 firebird firebird f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 firebird firebird -f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0644 firebird firebird f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0644 firebird firebird f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0644 firebird firebird diff --git a/builds/install/arch-specific/solx86gcc/CS/prototype.in b/builds/install/arch-specific/solx86gcc/CS/prototype.in index 11c536db4a..1d9e04ab41 100644 --- a/builds/install/arch-specific/solx86gcc/CS/prototype.in +++ b/builds/install/arch-specific/solx86gcc/CS/prototype.in @@ -108,7 +108,6 @@ f none @prefix@/include/blr.h=$SRCDIR/include/blr.h 0644 root root f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 root root f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0644 root root f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0644 root root -f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0644 root root d none @prefix@/intl 0755 root root f none @prefix@/intl/libfbintl.so=$SRCDIR/intl/libfbintl.so 0755 root root diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat index 6b9fb225b7..d7b1656282 100644 --- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat +++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat @@ -402,7 +402,6 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do ( @echo Copying other include files required for development... @set OUTPATH=%FB_OUTPUT_DIR%\include -@copy %FB_ROOT_PATH%\src\yvalve\perf.h %OUTPATH%\ > nul @copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ > nul || (@call :ERROR Failure executing copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ ) @if ERRORLEVEL 1 goto :END diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in index 0582705ddc..260030c739 100644 --- a/builds/posix/Makefile.in +++ b/builds/posix/Makefile.in @@ -755,7 +755,6 @@ include_generic: $(INCLUDE_DEST)/ib_util.h \ # ib_util.h as the marker for all the files. OtherDistribHeaders = extlib/ib_util.h \ - yvalve/perf.h \ include/iberror.h \ include/ibase.h diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index dd877e4517..c94eba1c02 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -97,7 +97,6 @@ for %%v in (gpre_boot build_msg common_test engine_test isql_test) do ( :: Headers copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul -copy %FB_ROOT_PATH%\src\jrd\perf.h %FB_OUTPUT_DIR%\include >nul copy %FB_ROOT_PATH%\src\include\ibase.h %FB_OUTPUT_DIR%\include > nul copy %FB_ROOT_PATH%\src\include\iberror.h %FB_OUTPUT_DIR%\include > nul copy %FB_GEN_DIR%\iberror_c.h %FB_OUTPUT_DIR%\include\firebird\impl > nul diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1751782bd..e6b5a0bead 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -906,7 +906,6 @@ add_custom_target(copy_files # headers COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/ib_util.h ${output_dir}/include/ib_util.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/include/gen/iberror.h ${output_dir}/include/iberror.h - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/yvalve/perf.h ${output_dir}/include/perf.h ) add_dependencies_cc (copy_files databases) add_dependencies_unix_cc(copy_files makeHeader) diff --git a/src/yvalve/perf.h b/src/yvalve/perf.h index b3d9958a15..6f9685094d 100644 --- a/src/yvalve/perf.h +++ b/src/yvalve/perf.h @@ -28,8 +28,8 @@ * */ -#ifndef FIREBIRD_PERF_H -#define FIREBIRD_PERF_H +#ifndef JRD_PERF_H +#define JRD_PERF_H #include @@ -116,5 +116,5 @@ typedef struct perf64 #include "../yvalve/perf_proto.h" -#endif /* FIREBIRD_PERF_H */ +#endif /* JRD_PERF_H */