bug-findutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/9] Fix some compiler warnings in findutils-version.c.


From: James Youngman
Subject: [PATCH 2/9] Fix some compiler warnings in findutils-version.c.
Date: Sat, 4 Jun 2011 01:21:46 +0100

* lib/findutils-version.c: include findutils-version.h.  Make
version_string const.  Don't #define N_, since we don't use it.
---
 ChangeLog               |    4 ++++
 lib/findutils-version.c |   13 ++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04b964a..9682b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-03  James Youngman  <address@hidden>
 
+       Fix some compiler warnings in findutils-version.c.
+       * lib/findutils-version.c: include findutils-version.h.  Make
+       version_string const.  Don't #define N_, since we don't use it.
+
        Don't display a separate gnulib version.
        * lib/findutils-version.c (display_findutils_version): Don't
        display gnulib_version because it's no longer defined (because
diff --git a/lib/findutils-version.c b/lib/findutils-version.c
index 5b8d4c6..774fd4c 100644
--- a/lib/findutils-version.c
+++ b/lib/findutils-version.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include "stdio-safer.h"
 #include "version-etc.h"
+#include "findutils-version.h"
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -25,24 +26,14 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
-
-
 
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */
 # define program_name program_invocation_name
 #endif
 
-
 extern char *program_name;
-char *version_string = VERSION;
-
+const char *version_string = VERSION;
 
 void
 display_findutils_version (const char *official_name)
-- 
1.7.2.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]