perf.h: a public file that depends on private file should not be a public file

Author: asfernandes

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
 

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
 

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

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
 

builds/posix/Makefile.in

@@ -752,7 +752,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
 

builds/win32/make_all.bat

@@ -97,7 +97,6 @@ for %%v in (gpre_boot build_msg common_test engine_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

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)

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 <stdio.h>
 
@@ -116,5 +116,5 @@ typedef struct perf64
 
 #include "../yvalve/perf_proto.h"
 
-#endif /* FIREBIRD_PERF_H */
+#endif /* JRD_PERF_H */