firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 14:03:03 +01:00
Code Issues

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

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2024-09-29 14:48:05 -03:00
parent d8f1d6bfef
commit 74c3725e0e
8 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builds/install/arch-specific/solaris/CS/prototype.in
View File

@ -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

1
builds/install/arch-specific/solaris/SS/prototype.in
View File

@ -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

1
builds/install/arch-specific/solx86gcc/CS/prototype.in
View File

@ -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

1
builds/install/arch-specific/win32/BuildExecutableInstall.bat
View File

@ -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

1
builds/posix/Makefile.in
View File

@ -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

1
builds/win32/make_all.bat
View File

@ -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

1
src/CMakeLists.txt
View File

@ -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)

6
src/yvalve/perf.h
View File

@ -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 */