Re: [PATCH/RFC v7 1/2] Add infrastructure for translating Git with gettext
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:48:55
Hi Ævar, Thanks for trying it out. Ævar Arnfjörð Bjarmason wrote:
quoted hunk ↗ jump to hunk
--- a/gettext.c +++ b/gettext.c@@ -1,11 +1,8 @@ -#ifdef NO_GETTEXT -void git_setup_gettext(void) {} -#else #include "exec_cmd.h" #include <libintl.h> #include <stdlib.h> -void git_setup_gettext(void) { +inline void git_setup_gettext(void) {
This should not be inline when NO_GETTEXT is unset, since other translation units don’t get a chance to see the definition.
quoted hunk ↗ jump to hunk
diff --git a/gettext.h b/gettext.h index a99da6a..8d44808 100644 --- a/gettext.h +++ b/gettext.h@@ -1,7 +1,11 @@ #ifndef GETTEXT_H #define GETTEXT_H -void git_setup_gettext(void); +#ifdef NO_GETTEXT +static inline void git_setup_gettext(void) {} +#else +inline void git_setup_gettext(void); +#endif
With s/^inline \(.*;\)/extern &/, to make it:
-void git_setup_gettext(void);
+#ifdef NO_GETTEXT
+static inline void git_setup_gettext(void) {}
+#else
+extern void git_setup_gettext(void);
+#endif
this part is exactly how I was imagining it (i.e., like might_fault()
in linux-2.6/include/linux/kernel.h and many other examples).
Thanks again.
Jonathan