projects
/
platform
/
upstream
/
fribidi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into tizen
[platform/upstream/fribidi.git]
/
gen.tab
/
gen-mirroring-tab.c
diff --git
a/gen.tab/gen-mirroring-tab.c
b/gen.tab/gen-mirroring-tab.c
index
b5dc127
..
21d33cf
100644
(file)
--- a/
gen.tab/gen-mirroring-tab.c
+++ b/
gen.tab/gen-mirroring-tab.c
@@
-1,12
+1,6
@@
/* FriBidi
* gen-mirroring-tab.c - generate mirroring.tab.i
*
/* FriBidi
* gen-mirroring-tab.c - generate mirroring.tab.i
*
- * $Id: gen-mirroring-tab.c,v 1.14 2006-01-31 03:23:12 behdad Exp $
- * $Author: behdad $
- * $Date: 2006-01-31 03:23:12 $
- * $Revision: 1.14 $
- * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-mirroring-tab.c,v $
- *
* Author:
* Behdad Esfahbod, 2001, 2002, 2004
*
* Author:
* Behdad Esfahbod, 2001, 2002, 2004
*
@@
-25,10
+19,10
@@
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library, in a file named COPYING; if not, write to the
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library, in a file named COPYING; if not, write to the
- * Free Software Foundation, Inc., 5
9 Temple Place, Suite 330
,
- * Boston, MA 0211
1-1307
, USA
+ * Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA
*
*
- * For licensing issues, contact <
license@farsiweb.info
>.
+ * For licensing issues, contact <
fribidi.license@gmail.com
>.
*/
#include <common.h>
*/
#include <common.h>
@@
-36,7
+30,7
@@
#include <fribidi-unicode.h>
#include <stdio.h>
#include <fribidi-unicode.h>
#include <stdio.h>
-#if
STDC_HEADERS+0
+#if
def STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
# include <stdlib.h>
# include <stddef.h>
#else
@@
-44,13
+38,13
@@
# include <stdlib.h>
# endif
#endif
# include <stdlib.h>
# endif
#endif
-#if
HAVE_STRING_H+0
+#if
def HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if
HAVE_STRINGS_H+0
+#if
def HAVE_STRINGS_H
# include <strings.h>
#endif
# include <strings.h>
#endif
@@
-173,7
+167,6
@@
read_data (
{
FILE *f;
{
FILE *f;
- fprintf (stderr, "Reading `%s'\n", data_file_name);
if (!(f = fopen (data_file_name, "rt")))
die2 ("error: cannot open `%s' for reading", data_file_name);
if (!(f = fopen (data_file_name, "rt")))
die2 ("error: cannot open `%s' for reading", data_file_name);
@@
-194,19
+187,17
@@
gen_mirroring_tab (
int key_bytes;
const char *key_type;
int key_bytes;
const char *key_type;
- fprintf (stderr,
- "Generating `" outputname "', it may take up to a few minutes\n");
printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME " "
FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version "
FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type);
printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME " "
FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version "
FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type);
- printf ("#define PACKTAB_UINT8
fribidi_uint8
\n"
- "#define PACKTAB_UINT16
fribidi_uint16
\n"
- "#define PACKTAB_UINT32
fribidi_uint32
\n\n");
+ printf ("#define PACKTAB_UINT8
uint8_t
\n"
+ "#define PACKTAB_UINT16
uint16_t
\n"
+ "#define PACKTAB_UINT32
uint32_t
\n\n");
key_bytes = max_dist <= 0x7f ? 1 : max_dist < 0x7fff ? 2 : 4;
key_bytes = max_dist <= 0x7f ? 1 : max_dist < 0x7fff ? 2 : 4;
- key_type = key_bytes == 1 ? "
fribidi_int8
" : key_bytes == 2 ?
- "
fribidi_int16" : "fribidi_int32
";
+ key_type = key_bytes == 1 ? "
int8_t
" : key_bytes == 2 ?
+ "
int16_t" : "int32_t
";
if (!pack_table
(table, FRIBIDI_UNICODE_CHARS, key_bytes, 0, max_depth, 1, NULL,
if (!pack_table
(table, FRIBIDI_UNICODE_CHARS, key_bytes, 0, max_depth, 1, NULL,