Fix declaration of compiled_features.

diff --git a/build-aux/build_info.pl b/build-aux/build_info.pl
index 372fe42ed2498339eb08c18b2f8477d58d8a961a..406c78d88863af53da14b5b663088cd4ba91da9b 100755 (executable)
--- a/build-aux/build_info.pl
+++ b/build-aux/build_info.pl
@@ -78,7 +78,7 @@ sub output_code
 
     print $fh do { local $/; <DATA> }, "\n";
     print $fh <<EOC;
-const char* (compiled_features[]) =
+const char *compiled_features[] =
 {
 
 EOC

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b22f6a95b126b3f3b8a6d3d855770dadebba194..d6c9dd56f7261304798f0536c1799b1d1a99cc93 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-10-09  Micah Cowan  <micah@cowan.name>
 
+       * main.c: Fix declaration of compiled_features.
+
        * build_info.c.in: Adapt to new input format. Added a check for
        large-file support. Replaced the "openssl" and "gnutls"
        advertisements with a single "ssl/foo" advertisement.

diff --git a/src/main.c b/src/main.c
index 40ea4f7611dd536421ec49f9bf27b0afe2706b90..ad39a53b9cdead59612a0ab75cc8ba936d495ab6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -76,7 +76,7 @@ extern char *compilation_string;
 extern char *system_getrc;
 extern char *link_string;
 /* defined in build_info.c */
-extern char *compiled_features[];
+extern const char *compiled_features[];
 /* Used for --version output in print_version */
 #define MAX_CHARS_PER_LINE      72
 #define TABULATION              4