Fixed.

5 files changed, 30 insertions, 17 deletions

diff --git a/fribidi.c b/fribidi.c
index 374df07..7a85b3f 100644
--- a/fribidi.c
+++ b/fribidi.c
@@ -41,9 +41,11 @@
 #endif
 
 #ifdef DEBUG
-#define DBG(s...) do { if (fribidi_debug_status(fribidienv)) { fprintf(stderr, s); } } while (0)
+#define DBG(s) do { if (fribidi_debug_status(fribidienv)) { fprintf(stderr, s); } } while (0)
+#define DBG2(s, t) do { if (fribidi_debug_status(fribidienv)) { fprintf(stderr, s, t); } } while (0)
 #else
-#define DBG(s...)
+#define DBG(s)
+#define DBG2(s, t)
 #endif
 
 #ifdef DEBUG
@@ -620,8 +622,8 @@ fribidi_analyse_string (FriBidiEnv *fribidienv,
 	  }
     }
   base_dir = FRIBIDI_LEVEL_TO_DIR (base_level);
-  DBG ("  Base level : %c\n", fribidi_char_from_level (base_level));
-  DBG ("  Base dir   : %c\n", fribidi_char_from_type (base_dir));
+  DBG2 ("  Base level : %c\n", fribidi_char_from_level (base_level));
+  DBG2 ("  Base dir   : %c\n", fribidi_char_from_type (base_dir));
   DBG ("  Finding the base level, Done\n");
 
 #ifdef DEBUG
@@ -1382,7 +1384,7 @@ fribidi_log2vis_get_embedding_levels (FriBidiEnv *fribidienv,
 
 const char *fribidi_version_info =
   FRIBIDI_PACKAGE " " FRIBIDI_VERSION "\n"
-  "interface version " TOSTR(FRIBIDI_INTERFACE_VERSION) "\n"
+  "interface version " TOSTR (FRIBIDI_INTERFACE_VERSION) "\n"
   "Unicode version " FRIBIDI_UNICODE_VERSION "\n"
   "\n"
   "Copyright (C) 2002 FriBidi Project (http://fribidi.sf.net/).\n"
diff --git a/fribidi_create_char_types.c b/fribidi_create_char_types.c
index 5ca9cf8..05261cd 100644
--- a/fribidi_create_char_types.c
+++ b/fribidi_create_char_types.c
@@ -190,6 +190,10 @@ write_char_type (char *file, int max_depth)
       fprintf (f, "#define %s FRIBIDI_PROP_TYPE_%s\n", names[i], names[i]);
   fprintf (f, "\n");
 
+  fprintf (f, "#define PACKTAB_UINT8 fribidi_uint8\n");
+  fprintf (f, "#define PACKTAB_UINT16 fribidi_uint16\n");
+  fprintf (f, "#define PACKTAB_UINT32 fribidi_uint32\n");
+  
   if (!pack_table
       (table, FRIBIDI_UNICODE_CHARS, SIZEOF_CHAR, max_depth, 3, names,
        key_type_name, table_name, macro_name, f))
diff --git a/fribidi_tab_char_type_2.i b/fribidi_tab_char_type_2.i
index f220c32..0004ea6 100644
--- a/fribidi_tab_char_type_2.i
+++ b/fribidi_tab_char_type_2.i
@@ -28,6 +28,9 @@
 #define SS FRIBIDI_PROP_TYPE_SS
 #define WS FRIBIDI_PROP_TYPE_WS
 
+#define PACKTAB_UINT8 fribidi_uint8
+#define PACKTAB_UINT16 fribidi_uint16
+#define PACKTAB_UINT32 fribidi_uint32
 /*
   Automatically generated by packtab.c version 2
 
@@ -824,7 +827,7 @@ static const FriBidiPropCharType FriBidiPropertyBlockLevel1[256*41] = {
   LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,
 };
 
-static const fribidi_uint16 FriBidiPropertyBlockLevel0[4352*1] = {
+static const PACKTAB_UINT16 FriBidiPropertyBlockLevel0[4352*1] = {
 
 #define FriBidiPropertyBlockLevel0_0000 0x0
 
diff --git a/fribidi_tab_char_type_9.i b/fribidi_tab_char_type_9.i
index 57a92b6..fc8fdc8 100644
--- a/fribidi_tab_char_type_9.i
+++ b/fribidi_tab_char_type_9.i
@@ -28,6 +28,9 @@
 #define SS FRIBIDI_PROP_TYPE_SS
 #define WS FRIBIDI_PROP_TYPE_WS
 
+#define PACKTAB_UINT8 fribidi_uint8
+#define PACKTAB_UINT16 fribidi_uint16
+#define PACKTAB_UINT32 fribidi_uint32
 /*
   Automatically generated by packtab.c version 2
 
@@ -261,7 +264,7 @@ static const FriBidiPropCharType FriBidiPropertyBlockLevel8[2*54] = {
    BN,NSM,
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel7[2*101] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel7[2*101] = {
 
 #define FriBidiPropertyBlockLevel7_0000 0x0
 
@@ -769,7 +772,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel7[2*101] = {
   FriBidiPropertyBlockLevel8_0042,  /* E0002..E0003 */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel6[8*131] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel6[8*131] = {
 
 #define FriBidiPropertyBlockLevel6_0000 0x0
 
@@ -2213,7 +2216,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel6[8*131] = {
   FriBidiPropertyBlockLevel7_0000,  /* E003C..E003F */
 };
 
-static const fribidi_uint16 FriBidiPropertyBlockLevel5[2*104] = {
+static const PACKTAB_UINT16 FriBidiPropertyBlockLevel5[2*104] = {
 
 #define FriBidiPropertyBlockLevel5_0000 0x0
 
@@ -2736,7 +2739,7 @@ static const fribidi_uint16 FriBidiPropertyBlockLevel5[2*104] = {
   FriBidiPropertyBlockLevel6_E0020,  /* E0060..E007F */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel4[4*41] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel4[4*41] = {
 
 #define FriBidiPropertyBlockLevel4_0000 0x0
 
@@ -3026,7 +3029,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel4[4*41] = {
   FriBidiPropertyBlockLevel5_0100,  /* E00C0..E00FF */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel3[8*12] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel3[8*12] = {
 
 #define FriBidiPropertyBlockLevel3_0000 0x0
 
@@ -3161,7 +3164,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel3[8*12] = {
   FriBidiPropertyBlockLevel4_0100,  /* E0700..E07FF */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel2[4*7] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel2[4*7] = {
 
 #define FriBidiPropertyBlockLevel2_0000 0x0
 
@@ -3213,7 +3216,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel2[4*7] = {
   FriBidiPropertyBlockLevel3_3800,  /* E1800..E1FFF */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel1[8*4] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel1[8*4] = {
 
 #define FriBidiPropertyBlockLevel1_0000 0x0
 
@@ -3260,7 +3263,7 @@ static const fribidi_uint8 FriBidiPropertyBlockLevel1[8*4] = {
   FriBidiPropertyBlockLevel2_4000,  /* EE000..EFFFF */
 };
 
-static const fribidi_uint8 FriBidiPropertyBlockLevel0[17*1] = {
+static const PACKTAB_UINT8 FriBidiPropertyBlockLevel0[17*1] = {
 
 #define FriBidiPropertyBlockLevel0_0000 0x0
 
diff --git a/packtab.c b/packtab.c
index 05f2e4f..486499a 100644
--- a/packtab.c
+++ b/packtab.c
@@ -214,8 +214,8 @@ write_array (int max_key)
       i = ii;
 
   key_type = !lev ? key_type_name :
-    max_key <= 0xff ? "fribidi_uint8" :
-    max_key <= 0xffff ? "fribidi_uint16" : "fribidi_uint32";
+    max_key <= 0xff ? "PACKTAB_UINT8" :
+    max_key <= 0xffff ? "PACKTAB_UINT16" : "PACKTAB_UINT32";
   fprintf (f, "static const %s %sLevel%d[%d*%d] = {", key_type, table_name,
 	   best_lev - lev - 1, cluster, k);
   ofs = 0;
@@ -270,7 +270,7 @@ write_source (void)
   s = 0;
   nn = n;
   t[0] = N;
-  fprintf (f, "\n*/\n\n" "/* *INDENT-OFF* */\n\n");
+  fprintf (f, "\n" "/* *INDENT-OFF* */\n\n");
   write_array (0);
   fprintf (f, "/* *INDENT-ON* */\n\n");
 
@@ -308,6 +308,7 @@ write_out ()
   fprintf (f, "\n" "  different table entries:");
   for (i = best_lev - 1; i >= 0; i--)
     fprintf (f, " %d", best_c[i]);
+  fprintf (f, "\n*/\n");
   write_source ();
 }