From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 22 Dec 2010 01:56:37 +0000 (+0000)
Subject: libiconv: add external var _libiconv_version
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=419de5c001387e052fe3a301a2c1aa642af27119;p=openwrt%2Fsvn-archive%2Farchive.git

libiconv: add external var _libiconv_version

This is needed by php5 and also provieded by the libiconv-full


SVN-Revision: 24775
---

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index ccce71d039..d51b47fbac 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -27,7 +27,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(TARGET_CC) -c $(PKG_BUILD_DIR)/iconv.c -o $(PKG_BUILD_DIR)/iconv.o
+	$(TARGET_CC) -c $(PKG_BUILD_DIR)/iconv.c -o $(PKG_BUILD_DIR)/iconv.o -I$(PKG_BUILD_DIR)/include
 	$(TARGET_CROSS)ar rcs $(PKG_BUILD_DIR)/libiconv.a $(PKG_BUILD_DIR)/iconv.o
 endef
 
diff --git a/libs/libiconv/src/iconv.c b/libs/libiconv/src/iconv.c
index 5834f6173d..e85b99a229 100644
--- a/libs/libiconv/src/iconv.c
+++ b/libs/libiconv/src/iconv.c
@@ -3,8 +3,9 @@
  */
 
 #include <stddef.h>
+#include <iconv.h>
 
-typedef void *iconv_t;
+int _libiconv_version = _LIBICONV_VERSION;
 
 iconv_t iconv_open (const char *tocode, const char *fromcode)
 {
diff --git a/libs/libiconv/src/include/iconv.h b/libs/libiconv/src/include/iconv.h
index bca749a66d..29c2d2a6f6 100644
--- a/libs/libiconv/src/include/iconv.h
+++ b/libs/libiconv/src/include/iconv.h
@@ -5,6 +5,9 @@
 #ifndef _ICONV_H
 #define _ICONV_H 1
 
+#define _LIBICONV_VERSION 0x010B    /* version number: (major<<8) + minor */
+extern  int _libiconv_version; /* Likewise */
+
 #include <stddef.h>
 
 typedef void *iconv_t;