Small fixes.

9 files changed, 39 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index f66477e..630b25f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ libfribidi_charsets_extra =	\
 libfribidi_charsets_h =	\
 	fribidi_char_sets.h	\
 	fribidi_char_sets_utf8.h
+
 libfribidi_charsets_extra_h =	\
 	fribidi_char_sets_cap_rtl.h	\
 	fribidi_char_sets_cp1255.h	\
@@ -28,6 +29,9 @@ libfribidi_charsets_extra_h =	\
 	fribidi_char_sets_iso8859_6.h	\
 	fribidi_char_sets_iso8859_8.h
 
+libfribidi_extra_h =	\
+	fribidi_mem.h
+
 lib_LTLIBRARIES = libfribidi.la
 
 libfribidi_la_SOURCES =	\
@@ -50,7 +54,6 @@ libfribidiinc_HEADERS =	\
 	fribidi.h	\
 	fribidi_types.h	\
 	fribidi_env.h	\
-	fribidi_mem.h	\
 	fribidi_unicode.h	\
 	$(libfribidi_charsets_h)	\
 	$(libfribidi_charsets_extra_h)	\
@@ -90,6 +93,7 @@ OTHER_FILES =	\
 
 EXTRA_HEADERS =	\
 	packtab.h	\
+	$(libfribidi_extra_h)	\
 	$(GETOPT_HDR)
 
 EXTRA_DIST =	\
diff --git a/configure.in b/configure.in
index 3459b26..887c388 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ AC_INIT(fribidi.c)
 #
 FRIBIDI_MAJOR_VERSION=0
 FRIBIDI_MINOR_VERSION=11
-FRIBIDI_MICRO_VERSION=0pre
+FRIBIDI_MICRO_VERSION=-0
 FRIBIDI_INTERFACE_VERSION=2
 FRIBIDI_INTERFACE_AGE=4
 FRIBIDI_BINARY_AGE=4
diff --git a/fribidi_char_sets.h b/fribidi_char_sets.h
index 47b21b2..c1bd571 100644
--- a/fribidi_char_sets.h
+++ b/fribidi_char_sets.h
@@ -64,50 +64,52 @@ extern "C"
 
 /* Convert the character string "s" in charset "char_set" to unicode
    string "us" and return it's length. */
-  int fribidi_charset_to_unicode (FriBidiCharSet char_set,
-				  char *s,
-				  int length,
-				  /* output */
-				  FriBidiChar *us);
+  FRIBIDI_API int fribidi_charset_to_unicode (FriBidiCharSet char_set,
+					      char *s,
+					      int length,
+					      /* output */
+					      FriBidiChar *us);
 
 /* Convert the unicode string "us" with length "length" to character
    string "s" in charset "char_set" and return it's length. */
-  int fribidi_unicode_to_charset (FriBidiCharSet char_set,
-				  FriBidiChar *us,
-				  int length,
-				  /* output */
-				  char *s);
+  FRIBIDI_API int fribidi_unicode_to_charset (FriBidiCharSet char_set,
+					      FriBidiChar *us,
+					      int length,
+					      /* output */
+					      char *s);
 
 /* Return the string containing the name of the charset. */
-  char *fribidi_char_set_name (FriBidiCharSet char_set);
+  FRIBIDI_API char *fribidi_char_set_name (FriBidiCharSet char_set);
 
 /* Return the string containing the title (name with a short description)
    of the charset. */
-  char *fribidi_char_set_title (FriBidiCharSet char_set);
+  FRIBIDI_API char *fribidi_char_set_title (FriBidiCharSet char_set);
 
 /* Return the string containing a descreption about the charset, if any. */
-  char *fribidi_char_set_desc (FriBidiCharSet char_set);
+  FRIBIDI_API char *fribidi_char_set_desc (FriBidiCharSet char_set);
 
 /* Some charsets like CapRTL may need to change some fribidis tables, by
    calling this function, they can do this changes. */
-  fribidi_boolean fribidi_char_set_enter (FriBidiCharSet char_set);
+  FRIBIDI_API fribidi_boolean fribidi_char_set_enter (FriBidiCharSet
+						      char_set);
 
 /* Some charsets like CapRTL may need to change some fribidis tables, by
    calling this function, they can undo their changes, perhaps to enter
    another mode. */
-  fribidi_boolean fribidi_char_set_leave (FriBidiCharSet char_set);
+  FRIBIDI_API fribidi_boolean fribidi_char_set_leave (FriBidiCharSet
+						      char_set);
 
 /* Return the charset which name is "s". */
-  FriBidiCharSet fribidi_parse_charset (char *s);
+  FRIBIDI_API FriBidiCharSet fribidi_parse_charset (char *s);
 
 
 #ifdef FRIBIDI_INTERFACE_1
 /* Interface version 1, deprecated, just for compatibility. */
 
-  int fribidi_charset_to_unicode_1 (FriBidiCharSet char_set,
-				    char *s,
-				    /* output */
-				    FriBidiChar *us);
+  FRIBIDI_API int fribidi_charset_to_unicode_1 (FriBidiCharSet char_set,
+						char *s,
+						/* output */
+						FriBidiChar *us);
 #define fribidi_charset_to_unicode	fribidi_charset_to_unicode_1
 
 /* Also old character sets. */
diff --git a/fribidi_config.h b/fribidi_config.h
index f20ea16..e458958 100644
--- a/fribidi_config.h
+++ b/fribidi_config.h
@@ -1,9 +1,10 @@
 
 #define FRIBIDI_PACKAGE "fribidi"
 
-#define FRIBIDI_VERSION "0.11.0pre"
+#define FRIBIDI_VERSION "0.11.-0"
 #define FRIBIDI_MAJOR_VERSION 0
 #define FRIBIDI_MINOR_VERSION 11
+#define FRIBIDI_MICRO_VERSION -0
 #define FRIBIDI_INTERFACE_VERSION 2
 
 #if 0 /* FRIBIDI_NO_CHARSETS */
diff --git a/fribidi_config.h.in b/fribidi_config.h.in
index aa204e3..79aceb1 100644
--- a/fribidi_config.h.in
+++ b/fribidi_config.h.in
@@ -4,6 +4,7 @@
 #define FRIBIDI_VERSION "@FRIBIDI_VERSION@"
 #define FRIBIDI_MAJOR_VERSION @FRIBIDI_MAJOR_VERSION@
 #define FRIBIDI_MINOR_VERSION @FRIBIDI_MINOR_VERSION@
+#define FRIBIDI_MICRO_VERSION @FRIBIDI_MICRO_VERSION@
 #define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@
 
 #if @FRIBIDI_NO_CHARSETS@ /* FRIBIDI_NO_CHARSETS */
diff --git a/fribidi_env.h b/fribidi_env.h
index 80f9368..0fc046d 100644
--- a/fribidi_env.h
+++ b/fribidi_env.h
@@ -45,7 +45,7 @@
 #ifndef FRIBIDI_ENV_H
 #define FRIBIDI_ENV_H
 
-#include "fribidi_mem.h"
+#include "fribidi_types.h"
 
 /* One of the following must be #defined. */
 #define GLOBAL_FRIBIDIENV
@@ -113,7 +113,7 @@ extern "C"
  */
 /* typedef struct _FriBidiEnv FriBidiEnv; */
 
-  struct _FriBidiEnv
+  typedef struct _FriBidiEnv
   {
     FriBidiMemChunkPrefix *iAllocatedMemoryChunks;
     /* Pointer to doubly-linked list of allocated memory chunks.
@@ -138,7 +138,9 @@ extern "C"
     fribidi_uint32 iReserved1;
     fribidi_uint32 iReserved2;
     void *iReserved3;		/* If necessary, will point at extension to FriBidiEnv. */
-  };
+  }
+  FriBidiEnv;
+
 
 /*======================================================================
  *  Initialize a FriBidiEnv structure.  Must be called before any
diff --git a/fribidi_mem.h b/fribidi_mem.h
index 041a72f..9500af4 100644
--- a/fribidi_mem.h
+++ b/fribidi_mem.h
@@ -30,8 +30,6 @@ extern "C"
 {
 #endif
 
-  typedef struct _FriBidiEnv FriBidiEnv;
-
   FriBidiList *fribidi_list_append (FriBidiEnv *fribidienv,
 				    FriBidiList *list,
 				    void *data);
diff --git a/win/fribidi.dsp b/win/fribidi.dsp
index d651493..0e421a3 100644
--- a/win/fribidi.dsp
+++ b/win/fribidi.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fribidi - Win32 Debug Speed Optimized
+CFG=fribidi - Win32 Release Memory Optimized
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
diff --git a/win/version.rc b/win/version.rc
index c0a934c..1c5b968 100644
--- a/win/version.rc
+++ b/win/version.rc
@@ -30,8 +30,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,0
- PRODUCTVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,0
+ FILEVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,FRIBIDI_INTERFACE_VERSION
+ PRODUCTVERSION FRIBIDI_MAJOR_VERSION,FRIBIDI_MINOR_VERSION,FRIBIDI_MICRO_VERSION,FRIBIDI_INTERFACE_VERSION
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L