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 ccce71d039cbc9468196a5537d255515490e1583..d51b47fbacd1d65e1d798aa45dc6852e25cf98fa 100644 (file)
--- 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 5834f6173dbf8277f5d8b591d49c0b559cae700b..e85b99a229c2a7e757ca9802b2b4cde2cd414ac9 100644 (file)
--- 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 bca749a66d1c58b6e6b16e869fcdc528a7731d3f..29c2d2a6f67cc71705ab3b6fa633704cf1d95147 100644 (file)
--- 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;