From c86f7c7b82e80fd40e251946a0d81123c5b16719 Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Fri, 9 Oct 2009 02:12:33 -0700
Subject: [PATCH] Fix declaration of compiled_features.

---
 build-aux/build_info.pl | 2 +-
 src/ChangeLog           | 2 ++
 src/main.c              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-aux/build_info.pl b/build-aux/build_info.pl
index 372fe42e..406c78d8 100755
--- 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 4b22f6a9..d6c9dd56 100644
--- 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 40ea4f76..ad39a53b 100644
--- 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