From: Mathieu Desnoyers Date: Thu, 7 May 2020 14:51:03 +0000 (-0400) Subject: Cleanup: Rename patches.i to patches.h X-Git-Tag: v2.13.0-rc1~219 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7ca11e776d8a72e0c7b277dbd9d7455e38607430;p=lttng-modules.git Cleanup: Rename patches.i to patches.h This generated header file contains a list of patches applied on the lttng-modules tree. Based on the C99 specification, ".i" files are not supposed to be preprocessed, although this header header file is expected to be preprocessed. Rename it from ".i" to ".h" to convey that it is a C header meant to be preprocessed. Signed-off-by: Mathieu Desnoyers --- diff --git a/scripts/extra-version-patches.sh b/scripts/extra-version-patches.sh index da79e1fd..aecbb2c9 100755 --- a/scripts/extra-version-patches.sh +++ b/scripts/extra-version-patches.sh @@ -19,9 +19,9 @@ if test ! -d "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}"; then mkdir "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}" fi -if test ! -f "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.i" || \ - test x"$(cat "${TMPFILE}")" != x"$(cat "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.i")"; then - mv "${TMPFILE}" "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.i" +if test ! -f "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.h" || \ + test x"$(cat "${TMPFILE}")" != x"$(cat "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.h")"; then + mv "${TMPFILE}" "${TOP_LTTNG_MODULES_DIR}/${INCLUDE_DIR}/patches.h" fi rm -f "${TMPFILE}" diff --git a/src/lttng-events.c b/src/lttng-events.c index a8536091..6bef77c9 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -3071,7 +3071,7 @@ static void __exit lttng_events_exit(void) module_exit(lttng_events_exit); -#include +#include #ifdef LTTNG_EXTRA_VERSION_GIT MODULE_INFO(extra_version_git, LTTNG_EXTRA_VERSION_GIT); #endif diff --git a/src/lttng-wrapper-impl.c b/src/lttng-wrapper-impl.c index e7f5660f..d83ced41 100644 --- a/src/lttng-wrapper-impl.c +++ b/src/lttng-wrapper-impl.c @@ -21,7 +21,7 @@ static void __exit lttng_exit(void) module_exit(lttng_exit); -#include +#include #ifdef LTTNG_EXTRA_VERSION_GIT MODULE_INFO(extra_version_git, LTTNG_EXTRA_VERSION_GIT); #endif