PatchSet 4881
Date: 2004/06/30 19:37:20
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed make dist and upgraded to getaddrinfo 1.6.2
2004-06-30 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/extensions/microsoft/clib/Makefile.am:
(AM_CPPFLAGS) Added jni to fix make dist.
* libraries/extensions/microsoft/clib/Makefile.in:
Regenerated.
* configure.ac:
Removed check for AC_STRUCT_ADDRINFO.
* configure,
config/config.h.in:
Regenerated.
* include/getaddrinfo.h,
m4/in6addr.m4,
m4/sockaddrin6.m4,
m4/sockinttypes.m4,
replace/getaddrinfo.c,
replace/memset.c:
Updated to getaddrinfo 1.6.2.
Members:
ChangeLog:1.2447->1.2448
configure:1.337->1.338
configure.ac:1.37->1.38
config/config.h.in:1.109->1.110
include/getaddrinfo.h:1.2->1.3
libraries/extensions/microsoft/clib/Makefile.am:1.6->1.7
libraries/extensions/microsoft/clib/Makefile.in:1.78->1.79
m4/in6addr.m4:1.2->1.3
m4/sockaddrin6.m4:1.2->1.3
m4/sockinttypes.m4:1.2->1.3
po/fr.po:1.3->1.4
po/kaffe.pot:1.2->1.3
po/zh_TW.po:1.3->1.4
replace/getaddrinfo.c:1.3->1.4
replace/memset.c:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2447 kaffe/ChangeLog:1.2448
--- kaffe/ChangeLog:1.2447 Tue Jun 29 13:06:53 2004
+++ kaffe/ChangeLog Wed Jun 30 19:37:20 2004
@@ -1,3 +1,26 @@
+2004-06-30 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/extensions/microsoft/clib/Makefile.am:
+ (AM_CPPFLAGS) Added jni to fix make dist.
+
+ * libraries/extensions/microsoft/clib/Makefile.in:
+ Regenerated.
+
+ * configure.ac:
+ Removed check for AC_STRUCT_ADDRINFO.
+
+ * configure,
+ config/config.h.in:
+ Regenerated.
+
+ * include/getaddrinfo.h,
+ m4/in6addr.m4,
+ m4/sockaddrin6.m4,
+ m4/sockinttypes.m4,
+ replace/getaddrinfo.c,
+ replace/memset.c:
+ Updated to getaddrinfo 1.6.2.
+
2004-06-29 Dalibor Topic <[EMAIL PROTECTED]>
* config/alpha/linux/md.h:
Index: kaffe/configure
diff -u kaffe/configure:1.337 kaffe/configure:1.338
--- kaffe/configure:1.337 Wed Jun 23 15:36:36 2004
+++ kaffe/configure Wed Jun 30 19:37:21 2004
@@ -48158,7 +48158,7 @@
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext
conftest.$ac_ext
fi
- if test "ac_cv_sin_port_size" = unknown; then
+ if test "$ac_cv_sin_port_size" = unknown; then
{ { echo "$as_me:$LINENO: error: Failed to get size of sin_port in struct
sockaddr_in." >&5
echo "$as_me: error: Failed to get size of sin_port in struct sockaddr_in." >&2;}
{ (exit 1); exit 1; }; }
@@ -48232,69 +48232,6 @@
_ACEOF
fi
-echo "$as_me:$LINENO: checking for struct addrinfo" >&5
-echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
-if test "${ac_cv_struct_addrinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <netdb.h>
-int
-main ()
-{
-
-struct addrinfo info;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_struct_addrinfo=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_addrinfo=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_addrinfo" >&5
-echo "${ECHO_T}$ac_cv_struct_addrinfo" >&6
-if test "$ac_cv_struct_addrinfo" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_ADDRINFO 1
-_ACEOF
-
-fi
saved_LIBS="$LIBS"
LIBS="$LIBS $NET_LIBS"
@@ -48609,7 +48546,7 @@
fi
-if test $ac_cv_struct_in6_addr = no ; then
+if test $ac_cv_struct_in6_addr = no; then
ac_cv_decl_in6addr_any=no
else
echo "$as_me:$LINENO: checking for in6addr_any declaration in netinet/in.h" >&5
@@ -48680,7 +48617,7 @@
fi
fi
-if test $ac_cv_struct_in6_addr = no ; then
+if test $ac_cv_struct_in6_addr = no; then
ac_cv_decl_in6addr_loopback=no
else
echo "$as_me:$LINENO: checking for in6addr_loopback declaration in netinet/in.h"
>&5
@@ -48977,7 +48914,7 @@
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext
conftest.$ac_ext
fi
- if test "ac_cv_sa_family_size" = unknown; then
+ if test "$ac_cv_sa_family_size" = unknown; then
{ { echo "$as_me:$LINENO: error: Failed to get size of sa_family in struct
sockaddr." >&5
echo "$as_me: error: Failed to get size of sa_family in struct sockaddr." >&2;}
{ (exit 1); exit 1; }; }
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.37 kaffe/configure.ac:1.38
--- kaffe/configure.ac:1.37 Wed Jun 23 15:36:42 2004
+++ kaffe/configure.ac Wed Jun 30 19:37:27 2004
@@ -1262,7 +1262,6 @@
AC_TYPE_SOCKLEN_T
AC_TYPE_IN_PORT_T
AC_DECL_H_ERRNO
-AC_STRUCT_ADDRINFO
saved_LIBS="$LIBS"
LIBS="$LIBS $NET_LIBS"
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.109 kaffe/config/config.h.in:1.110
--- kaffe/config/config.h.in:1.109 Wed Jun 23 15:36:43 2004
+++ kaffe/config/config.h.in Wed Jun 30 19:37:28 2004
@@ -482,9 +482,6 @@
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
-/* Define to 1 if <netdb.h> defines `struct addrinfo' */
-#undef HAVE_STRUCT_ADDRINFO
-
/* Define to 1 if <netinet/in.h> defines `struct in6_addr' */
#undef HAVE_STRUCT_IN6_ADDR
Index: kaffe/include/getaddrinfo.h
diff -u kaffe/include/getaddrinfo.h:1.2 kaffe/include/getaddrinfo.h:1.3
--- kaffe/include/getaddrinfo.h:1.2 Tue Sep 23 21:44:08 2003
+++ kaffe/include/getaddrinfo.h Wed Jun 30 19:37:29 2004
@@ -131,7 +131,7 @@
* Fake struct and function names.
* <netdb.h> might declares all or some of them.
*/
-#if defined(HAVE_GETADDRINFO) || defined(HAVE_GETNAMEINFO) ||
defined(HAVE_STRUCT_ADDRINFO)
+#if defined(HAVE_GETADDRINFO) || defined(HAVE_GETNAMEINFO)
#define addrinfo my_addrinfo
#define gai_strerror my_gai_strerror
#define freeaddrinfo my_freeaddrinfo
Index: kaffe/libraries/extensions/microsoft/clib/Makefile.am
diff -u kaffe/libraries/extensions/microsoft/clib/Makefile.am:1.6
kaffe/libraries/extensions/microsoft/clib/Makefile.am:1.7
--- kaffe/libraries/extensions/microsoft/clib/Makefile.am:1.6 Thu Jan 15 02:29:49
2004
+++ kaffe/libraries/extensions/microsoft/clib/Makefile.am Wed Jun 30 19:37:29
2004
@@ -6,7 +6,9 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/kaffe/kaffevm/jni
native_LTLIBRARIES = libmicrosoft.la
Index: kaffe/libraries/extensions/microsoft/clib/Makefile.in
diff -u kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.78
kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.79
--- kaffe/libraries/extensions/microsoft/clib/Makefile.in:1.78 Wed Jun 23 09:12:02
2004
+++ kaffe/libraries/extensions/microsoft/clib/Makefile.in Wed Jun 30 19:37:29
2004
@@ -336,7 +336,10 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/kaffe/kaffevm/jni
+
native_LTLIBRARIES = libmicrosoft.la
libmicrosoft_la_LDFLAGS = \
$(KLIBFLAGS) \
Index: kaffe/m4/in6addr.m4
diff -u kaffe/m4/in6addr.m4:1.2 kaffe/m4/in6addr.m4:1.3
--- kaffe/m4/in6addr.m4:1.2 Mon Mar 22 14:25:54 2004
+++ kaffe/m4/in6addr.m4 Wed Jun 30 19:37:30 2004
@@ -47,7 +47,7 @@
dnl *
AC_DEFUN([AC_DECL_IN6ADDR_ANY],
[AC_REQUIRE([AC_STRUCT_IN6_ADDR])
-if test $ac_cv_struct_in6_addr = no ; then
+if test $ac_cv_struct_in6_addr = no; then
ac_cv_decl_in6addr_any=no
else
AC_CACHE_CHECK(for in6addr_any declaration in netinet/in.h,
@@ -70,7 +70,7 @@
dnl *
AC_DEFUN([AC_DECL_IN6ADDR_LOOPBACK],
[AC_REQUIRE([AC_STRUCT_IN6_ADDR])
-if test $ac_cv_struct_in6_addr = no ; then
+if test $ac_cv_struct_in6_addr = no; then
ac_cv_decl_in6addr_loopback=no
else
AC_CACHE_CHECK(for in6addr_loopback declaration in netinet/in.h,
Index: kaffe/m4/sockaddrin6.m4
diff -u kaffe/m4/sockaddrin6.m4:1.2 kaffe/m4/sockaddrin6.m4:1.3
--- kaffe/m4/sockaddrin6.m4:1.2 Mon Mar 22 14:25:54 2004
+++ kaffe/m4/sockaddrin6.m4 Wed Jun 30 19:37:30 2004
@@ -58,17 +58,3 @@
[Define to 1 if <netinet/in.h> defines `struct sockaddr_storage'])
fi])
-dnl *
-dnl * Check for struct addrinfo
-dnl *
-AC_DEFUN([AC_STRUCT_ADDRINFO],
-[AC_CACHE_CHECK(for struct addrinfo, ac_cv_struct_addrinfo,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <netdb.h>]], [[
-struct addrinfo info;
-]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no])])
-if test "$ac_cv_struct_addrinfo" = yes; then
- AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1,
-[Define to 1 if <netdb.h> defines `struct addrinfo'])
-fi])
-
Index: kaffe/m4/sockinttypes.m4
diff -u kaffe/m4/sockinttypes.m4:1.2 kaffe/m4/sockinttypes.m4:1.3
--- kaffe/m4/sockinttypes.m4:1.2 Mon Mar 22 14:25:54 2004
+++ kaffe/m4/sockinttypes.m4 Wed Jun 30 19:37:30 2004
@@ -90,7 +90,7 @@
return (sizeof(addr.sin_port) == sizeof(char)) ? 0 : 1;
}
]])],[ac_cv_sin_port_size=char],[],[])
- if test "ac_cv_sin_port_size" = unknown; then
+ if test "$ac_cv_sin_port_size" = unknown; then
AC_MSG_ERROR([Failed to get size of sin_port in struct sockaddr_in.])
fi
AC_DEFINE_UNQUOTED(in_port_t, unsigned $ac_cv_sin_port_size,
@@ -144,7 +144,7 @@
return (sizeof(addr.sa_family) == sizeof(char)) ? 0 : 1;
}
]])],[ac_cv_sa_family_size=char],[],[])
- if test "ac_cv_sa_family_size" = unknown; then
+ if test "$ac_cv_sa_family_size" = unknown; then
AC_MSG_ERROR([Failed to get size of sa_family in struct sockaddr.])
fi
AC_DEFINE_UNQUOTED(sa_family_t, unsigned $ac_cv_sa_family_size,
Index: kaffe/po/fr.po
diff -u kaffe/po/fr.po:1.3 kaffe/po/fr.po:1.4
--- kaffe/po/fr.po:1.3 Wed Jun 23 09:12:06 2004
+++ kaffe/po/fr.po Wed Jun 30 19:37:30 2004
@@ -6,104 +6,104 @@
msgid ""
msgstr ""
"Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
-"POT-Creation-Date: 2004-06-18 21:41+0200\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2004-06-30 14:46+0200\n"
"PO-Revision-Date: 2004-06-03 22:00+0200\n"
"Last-Translator: Guilhem Lavaux <[EMAIL PROTECTED]>\n"
"Language-Team: French <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-#: kaffe/kaffe/main.c:393 kaffe/kaffe/main.c:420 kaffe/kaffe/main.c:445
-#: kaffe/kaffe/main.c:467
+#: kaffe/kaffe/main.c:398 kaffe/kaffe/main.c:425 kaffe/kaffe/main.c:450
+#: kaffe/kaffe/main.c:472
#, c-format
msgid "Error: out of memory.\n"
msgstr "Erreur: pas assez de m�moire.\n"
-#: kaffe/kaffe/main.c:482
+#: kaffe/kaffe/main.c:487
#, c-format
msgid "Error: No stack size found for -ss option.\n"
msgstr ""
"Erreur: La taille de la pile n'a pas �t� trouv� apr�s l'argument -ss.\n"
-#: kaffe/kaffe/main.c:490
+#: kaffe/kaffe/main.c:495
#, c-format
msgid "Warning: Attempt to set stack size smaller than %d - ignored.\n"
msgstr ""
"Avertissement: Vous ne pouvez pas sp�cifer une taille de pile plus petite "
"que %d - valeur ignor�e.\n"
-#: kaffe/kaffe/main.c:501
+#: kaffe/kaffe/main.c:506
#, c-format
msgid "Error: No heap size found for -mx option.\n"
msgstr "Erreur: Pas de taille de tas trouv�e apr�s l'argument -mx.\n"
-#: kaffe/kaffe/main.c:514
+#: kaffe/kaffe/main.c:519
#, c-format
msgid "Error: No heap size found for -ms option.\n"
msgstr "Erreur: Pas de taille du tas trouv�e apr�s l'argument -ms.\n"
-#: kaffe/kaffe/main.c:526
+#: kaffe/kaffe/main.c:531
#, c-format
msgid "Error: No heap size found for -as option.\n"
msgstr "Erreur: Pas de taille de tas trouv�e apr�s l'argument -as.\n"
-#: kaffe/kaffe/main.c:582
+#: kaffe/kaffe/main.c:587
#, c-format
msgid "Error: -Xxprof_syms option requires a file name.\n"
msgstr "Erreur: L'argument -Xxprof_syms n�cessite un nom de fichier.\n"
-#: kaffe/kaffe/main.c:588
+#: kaffe/kaffe/main.c:593
#, c-format
msgid "Unable to create profiler symbol file %s.\n"
msgstr ""
"Impossible de cr�er le fichier %s devant contenir les symboles de "
"profilage.\n"
-#: kaffe/kaffe/main.c:597
+#: kaffe/kaffe/main.c:602
#, c-format
msgid "Error: -Xxprof_gmon option requires a file name.\n"
msgstr "Erreur: L'argument -Xxprof_gmon n�cessite un nom de fichier.\n"
-#: kaffe/kaffe/main.c:603
+#: kaffe/kaffe/main.c:608
#, c-format
msgid "Unable to create gmon file %s.\n"
msgstr "Impossible de cr�er le fichier gmon nomm� %s.\n"
-#: kaffe/kaffe/main.c:617
+#: kaffe/kaffe/main.c:622
#, c-format
msgid "Error: -Xxdebug_file option requires a file name.\n"
msgstr "Erreur: L'option -Xxdebug_file requiert un nom de fichier.\n"
-#: kaffe/kaffe/main.c:631
+#: kaffe/kaffe/main.c:636
#, c-format
msgid "Error: -Xfeedback option requires a file name.\n"
msgstr "Erreur: L'option -Xfeedback requiert un nom de fichier.\n"
-#: kaffe/kaffe/main.c:649
+#: kaffe/kaffe/main.c:654
#, c-format
msgid "Error: -vmstats option requires a second arg.\n"
msgstr "Erreur: L'option -vmstats requiert un second argument.\\n\n"
-#: kaffe/kaffe/main.c:661
+#: kaffe/kaffe/main.c:666
#, c-format
msgid "Error: -vmdebug option requires a debug flag. Use `list' for a list.\n"
msgstr ""
"Erreur: L'option -vmdebug requiert un param�tre. Utilisez 'list' pour avoir "
"une liste des param�tres.\n"
-#: kaffe/kaffe/main.c:687
+#: kaffe/kaffe/main.c:692
#, c-format
msgid "Error: Unrecognized JVM specific option `%s'.\n"
msgstr "Erreur: L'option '%s' sp�cifique � la JVM n'est pas connue.\n"
-#: kaffe/kaffe/main.c:702
+#: kaffe/kaffe/main.c:707
#, c-format
msgid "Unknown flag: %s\n"
msgstr "Param�tre inconnu: %s\n"
-#: kaffe/kaffe/main.c:718
+#: kaffe/kaffe/main.c:723
#, c-format
msgid ""
"usage: kaffe [-options] class\n"
@@ -118,12 +118,12 @@
"\t-version\t\t Affiche le num�ro de version\n"
"\t-fullversion\t\t Affiche plus d'information sur la version\n"
-#: kaffe/kaffe/main.c:724
+#: kaffe/kaffe/main.c:729
#, c-format
msgid "\t-ia32\t\t\t Execute the ia32 version of Kaffe\n"
msgstr "\t-ia32\t\t\t Ex�cute la version ia32 de kaffe\n"
-#: kaffe/kaffe/main.c:726
+#: kaffe/kaffe/main.c:731
#, c-format
msgid ""
"\t-ss <size>\t\t Maximum native stack size\n"
@@ -166,12 +166,12 @@
"\t-verbosecall\t\t Affiche des information sur les m�thodes appel�es\n"
"\t-nodeadlock\t\t D�sactive la d�tection des deadlock\n"
-#: kaffe/kaffe/main.c:746
+#: kaffe/kaffe/main.c:751
#, c-format
msgid "\t-prof\t\t\t Enable profiling of Java methods\n"
msgstr "\t-prof\t\t\t Active le profilage des m�thodes Java\n"
-#: kaffe/kaffe/main.c:749
+#: kaffe/kaffe/main.c:754
#, c-format
msgid ""
"\t-Xxprof\t\t\t Enable cross language profiling\n"
@@ -185,19 +185,19 @@
"\t-Xxprof_gmon <fichier>\t Nom de base pour les fichiers gmon [D�faut: "
"xgmon.out]\n"
-#: kaffe/kaffe/main.c:754
+#: kaffe/kaffe/main.c:759
#, c-format
msgid "\t-Xxdebug_file <file>\t Name of the debugging symbols file\n"
msgstr ""
"\t-Xxdebug_file <fichier>\t Fichier pour les symboles de d�bogages.\n"
-#: kaffe/kaffe/main.c:757
+#: kaffe/kaffe/main.c:762
#, c-format
msgid "\t-Xfeedback <file>\t The file name to write feedback data to\n"
msgstr ""
"\t-Xfeedback <fichier>\t Le fichier devant contenir les donn�es feedback\n"
-#: kaffe/kaffe/main.c:759
+#: kaffe/kaffe/main.c:764
#, c-format
msgid ""
"\t-debug * \t\t Trace method calls\n"
@@ -212,7 +212,7 @@
"\t-oss <taille> *\t\t Taille maximale de la pile\n"
"\t-jar\t\t\t L'ex�cutable est un JAR\n"
-#: kaffe/kaffe/main.c:765
+#: kaffe/kaffe/main.c:770
#, c-format
msgid ""
"\t-vmdebug <flag{,flag}>\t Internal VM debugging. Set flag=list for a list\n"
@@ -220,14 +220,14 @@
"\t-vmdebug <flag{,flag}>\t D�bogage interne de la VM. Utilisez flag=list "
"pour avoir la liste\n"
-#: kaffe/kaffe/main.c:768
+#: kaffe/kaffe/main.c:773
#, c-format
msgid "\t-vmstats <flag{,flag}>\t Print VM statistics. Set flag=all for all\n"
msgstr ""
"\t-vmstats <flag{,flag>\t Affiche des statistiques sur la VM. Utilisez "
"flag=all pour les avoir toutes.\n"
-#: kaffe/kaffe/main.c:770
+#: kaffe/kaffe/main.c:775
#, c-format
msgid ""
" * Option currently ignored.\n"
Index: kaffe/po/kaffe.pot
diff -u kaffe/po/kaffe.pot:1.2 kaffe/po/kaffe.pot:1.3
--- kaffe/po/kaffe.pot:1.2 Tue Jun 22 15:35:51 2004
+++ kaffe/po/kaffe.pot Wed Jun 30 19:37:30 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-06-18 21:41+0200\n"
+"POT-Creation-Date: 2004-06-30 14:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -16,88 +16,88 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kaffe/kaffe/main.c:393 kaffe/kaffe/main.c:420 kaffe/kaffe/main.c:445
-#: kaffe/kaffe/main.c:467
+#: kaffe/kaffe/main.c:398 kaffe/kaffe/main.c:425 kaffe/kaffe/main.c:450
+#: kaffe/kaffe/main.c:472
#, c-format
msgid "Error: out of memory.\n"
msgstr ""
-#: kaffe/kaffe/main.c:482
+#: kaffe/kaffe/main.c:487
#, c-format
msgid "Error: No stack size found for -ss option.\n"
msgstr ""
-#: kaffe/kaffe/main.c:490
+#: kaffe/kaffe/main.c:495
#, c-format
msgid "Warning: Attempt to set stack size smaller than %d - ignored.\n"
msgstr ""
-#: kaffe/kaffe/main.c:501
+#: kaffe/kaffe/main.c:506
#, c-format
msgid "Error: No heap size found for -mx option.\n"
msgstr ""
-#: kaffe/kaffe/main.c:514
+#: kaffe/kaffe/main.c:519
#, c-format
msgid "Error: No heap size found for -ms option.\n"
msgstr ""
-#: kaffe/kaffe/main.c:526
+#: kaffe/kaffe/main.c:531
#, c-format
msgid "Error: No heap size found for -as option.\n"
msgstr ""
-#: kaffe/kaffe/main.c:582
+#: kaffe/kaffe/main.c:587
#, c-format
msgid "Error: -Xxprof_syms option requires a file name.\n"
msgstr ""
-#: kaffe/kaffe/main.c:588
+#: kaffe/kaffe/main.c:593
#, c-format
msgid "Unable to create profiler symbol file %s.\n"
msgstr ""
-#: kaffe/kaffe/main.c:597
+#: kaffe/kaffe/main.c:602
#, c-format
msgid "Error: -Xxprof_gmon option requires a file name.\n"
msgstr ""
-#: kaffe/kaffe/main.c:603
+#: kaffe/kaffe/main.c:608
#, c-format
msgid "Unable to create gmon file %s.\n"
msgstr ""
-#: kaffe/kaffe/main.c:617
+#: kaffe/kaffe/main.c:622
#, c-format
msgid "Error: -Xxdebug_file option requires a file name.\n"
msgstr ""
-#: kaffe/kaffe/main.c:631
+#: kaffe/kaffe/main.c:636
#, c-format
msgid "Error: -Xfeedback option requires a file name.\n"
msgstr ""
-#: kaffe/kaffe/main.c:649
+#: kaffe/kaffe/main.c:654
#, c-format
msgid "Error: -vmstats option requires a second arg.\n"
msgstr ""
-#: kaffe/kaffe/main.c:661
+#: kaffe/kaffe/main.c:666
#, c-format
msgid "Error: -vmdebug option requires a debug flag. Use `list' for a list.\n"
msgstr ""
-#: kaffe/kaffe/main.c:687
+#: kaffe/kaffe/main.c:692
#, c-format
msgid "Error: Unrecognized JVM specific option `%s'.\n"
msgstr ""
-#: kaffe/kaffe/main.c:702
+#: kaffe/kaffe/main.c:707
#, c-format
msgid "Unknown flag: %s\n"
msgstr ""
-#: kaffe/kaffe/main.c:718
+#: kaffe/kaffe/main.c:723
#, c-format
msgid ""
"usage: kaffe [-options] class\n"
@@ -107,12 +107,12 @@
"\t-fullversion\t\t Print verbose version info\n"
msgstr ""
-#: kaffe/kaffe/main.c:724
+#: kaffe/kaffe/main.c:729
#, c-format
msgid "\t-ia32\t\t\t Execute the ia32 version of Kaffe\n"
msgstr ""
-#: kaffe/kaffe/main.c:726
+#: kaffe/kaffe/main.c:731
#, c-format
msgid ""
"\t-ss <size>\t\t Maximum native stack size\n"
@@ -136,12 +136,12 @@
"\t-nodeadlock\t\t Disable deadlock detection\n"
msgstr ""
-#: kaffe/kaffe/main.c:746
+#: kaffe/kaffe/main.c:751
#, c-format
msgid "\t-prof\t\t\t Enable profiling of Java methods\n"
msgstr ""
-#: kaffe/kaffe/main.c:749
+#: kaffe/kaffe/main.c:754
#, c-format
msgid ""
"\t-Xxprof\t\t\t Enable cross language profiling\n"
@@ -150,17 +150,17 @@
"\t-Xxprof_gmon <file>\t Base name for gmon files [Default: xgmon.out]\n"
msgstr ""
-#: kaffe/kaffe/main.c:754
+#: kaffe/kaffe/main.c:759
#, c-format
msgid "\t-Xxdebug_file <file>\t Name of the debugging symbols file\n"
msgstr ""
-#: kaffe/kaffe/main.c:757
+#: kaffe/kaffe/main.c:762
#, c-format
msgid "\t-Xfeedback <file>\t The file name to write feedback data to\n"
msgstr ""
-#: kaffe/kaffe/main.c:759
+#: kaffe/kaffe/main.c:764
#, c-format
msgid ""
"\t-debug * \t\t Trace method calls\n"
@@ -170,18 +170,18 @@
"\t-jar Executable is a JAR\n"
msgstr ""
-#: kaffe/kaffe/main.c:765
+#: kaffe/kaffe/main.c:770
#, c-format
msgid ""
"\t-vmdebug <flag{,flag}>\t Internal VM debugging. Set flag=list for a list\n"
msgstr ""
-#: kaffe/kaffe/main.c:768
+#: kaffe/kaffe/main.c:773
#, c-format
msgid "\t-vmstats <flag{,flag}>\t Print VM statistics. Set flag=all for all\n"
msgstr ""
-#: kaffe/kaffe/main.c:770
+#: kaffe/kaffe/main.c:775
#, c-format
msgid ""
" * Option currently ignored.\n"
Index: kaffe/po/zh_TW.po
diff -u kaffe/po/zh_TW.po:1.3 kaffe/po/zh_TW.po:1.4
--- kaffe/po/zh_TW.po:1.3 Wed Jun 23 09:12:06 2004
+++ kaffe/po/zh_TW.po Wed Jun 30 19:37:30 2004
@@ -6,97 +6,97 @@
msgid ""
msgstr ""
"Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
-"POT-Creation-Date: 2004-06-18 21:41+0200\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2004-06-30 14:46+0200\n"
"PO-Revision-Date: 2004-06-05 12:00+0800\n"
"Last-Translator: Jim Huang <[EMAIL PROTECTED]>\n"
"Language-Team: Traditional Chinese <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=big5\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-#: kaffe/kaffe/main.c:393 kaffe/kaffe/main.c:420 kaffe/kaffe/main.c:445
-#: kaffe/kaffe/main.c:467
+#: kaffe/kaffe/main.c:398 kaffe/kaffe/main.c:425 kaffe/kaffe/main.c:450
+#: kaffe/kaffe/main.c:472
#, c-format
msgid "Error: out of memory.\n"
msgstr "���~�G�O���餣��\n"
-#: kaffe/kaffe/main.c:482
+#: kaffe/kaffe/main.c:487
#, c-format
msgid "Error: No stack size found for -ss option.\n"
msgstr "���~�G�b -ss �ﶵ���S�����w���|�Ŷ�\n"
-#: kaffe/kaffe/main.c:490
+#: kaffe/kaffe/main.c:495
#, c-format
msgid "Warning: Attempt to set stack size smaller than %d - ignored.\n"
msgstr "ĵ�i�G���ճ]�w�֩� %d �����|�Ŷ�\n"
-#: kaffe/kaffe/main.c:501
+#: kaffe/kaffe/main.c:506
#, c-format
msgid "Error: No heap size found for -mx option.\n"
msgstr "���~�G�b -mx �ﶵ���S�����w heap �Ŷ�\n"
-#: kaffe/kaffe/main.c:514
+#: kaffe/kaffe/main.c:519
#, c-format
msgid "Error: No heap size found for -ms option.\n"
msgstr "���~�G�b -ms �ﶵ���S�����w heap �Ŷ�\n"
-#: kaffe/kaffe/main.c:526
+#: kaffe/kaffe/main.c:531
#, c-format
msgid "Error: No heap size found for -as option.\n"
msgstr "���~�G�b -as �ﶵ���S�����w heap �Ŷ�\n"
-#: kaffe/kaffe/main.c:582
+#: kaffe/kaffe/main.c:587
#, c-format
msgid "Error: -Xxprof_syms option requires a file name.\n"
msgstr "���~�G-Xxprof_syms �ﶵ�ݭn�����ɦW\n"
-#: kaffe/kaffe/main.c:588
+#: kaffe/kaffe/main.c:593
#, c-format
msgid "Unable to create profiler symbol file %s.\n"
msgstr "�L�k�إ� profiler symbol �ɡG%s\n"
-#: kaffe/kaffe/main.c:597
+#: kaffe/kaffe/main.c:602
#, c-format
msgid "Error: -Xxprof_gmon option requires a file name.\n"
msgstr "���~�G-Xxprof_gmon �ﶵ�ݭn�����ɦW\n"
-#: kaffe/kaffe/main.c:603
+#: kaffe/kaffe/main.c:608
#, c-format
msgid "Unable to create gmon file %s.\n"
msgstr "�L�k�إ� gmon �� %s\n"
-#: kaffe/kaffe/main.c:617
+#: kaffe/kaffe/main.c:622
#, c-format
msgid "Error: -Xxdebug_file option requires a file name.\n"
msgstr "���~�G-Xxdebug_file �ﶵ�ݭn�����ɦW\n"
-#: kaffe/kaffe/main.c:631
+#: kaffe/kaffe/main.c:636
#, c-format
msgid "Error: -Xfeedback option requires a file name.\n"
msgstr "���~�G-Xfreedback �ﶵ�ݭn�����ɦW\n"
-#: kaffe/kaffe/main.c:649
+#: kaffe/kaffe/main.c:654
#, c-format
msgid "Error: -vmstats option requires a second arg.\n"
msgstr "���~�G-vmstats �ﶵ�ݭn�B�~���Ѽ�\n"
-#: kaffe/kaffe/main.c:661
+#: kaffe/kaffe/main.c:666
#, c-format
msgid "Error: -vmdebug option requires a debug flag. Use `list' for a list.\n"
msgstr "���~�G-vmdebug �ﶵ�ݭn�����X�СA�Х� -vmdebug list ���o�X�ЦC��\n"
-#: kaffe/kaffe/main.c:687
+#: kaffe/kaffe/main.c:692
#, c-format
msgid "Error: Unrecognized JVM specific option `%s'.\n"
msgstr "���~�G�L�k���Ѫ� JVM �ﶵ '%s'\n"
-#: kaffe/kaffe/main.c:702
+#: kaffe/kaffe/main.c:707
#, c-format
msgid "Unknown flag: %s\n"
msgstr "�������X�СG%s\n"
-#: kaffe/kaffe/main.c:718
+#: kaffe/kaffe/main.c:723
#, c-format
msgid ""
"usage: kaffe [-options] class\n"
@@ -111,12 +111,12 @@
"\t-version\t\t �L�C�������X\n"
"\t-fullversion\t\t �L�C�ԲӪ�������T\n"
-#: kaffe/kaffe/main.c:724
+#: kaffe/kaffe/main.c:729
#, c-format
msgid "\t-ia32\t\t\t Execute the ia32 version of Kaffe\n"
msgstr "\t-ia32\t\t\t ���� ia32 ������ Kaffe\n"
-#: kaffe/kaffe/main.c:726
+#: kaffe/kaffe/main.c:731
#, c-format
msgid ""
"\t-ss <size>\t\t Maximum native stack size\n"
@@ -159,12 +159,12 @@
"\t-verbosecall\t\t �L�C�ԲөI�s�y�{��T\n"
"\t-nodeadlock\t\t �������� (deadlock) ����\n"
-#: kaffe/kaffe/main.c:746
+#: kaffe/kaffe/main.c:751
#, c-format
msgid "\t-prof\t\t\t Enable profiling of Java methods\n"
msgstr "\t-prof\t\t\t �}�� Java method �� profiling\n"
-#: kaffe/kaffe/main.c:749
+#: kaffe/kaffe/main.c:754
#, c-format
msgid ""
"\t-Xxprof\t\t\t Enable cross language profiling\n"
@@ -177,17 +177,17 @@
"symbols.s]\n"
"\t-Xxprof_gmon <file>\t ���w gmon �ɮת��W�� [�w�]�ȡGxgmon.out]\n"
-#: kaffe/kaffe/main.c:754
+#: kaffe/kaffe/main.c:759
#, c-format
msgid "\t-Xxdebug_file <file>\t Name of the debugging symbols file\n"
msgstr "\t-Xxdebug_file <file>\t ���w debugging symbol �ɮצW��\n"
-#: kaffe/kaffe/main.c:757
+#: kaffe/kaffe/main.c:762
#, c-format
msgid "\t-Xfeedback <file>\t The file name to write feedback data to\n"
msgstr "\t-Xfeedback <file>\t ���w��X feedback ��ƪ��ɦW\n"
-#: kaffe/kaffe/main.c:759
+#: kaffe/kaffe/main.c:764
#, c-format
msgid ""
"\t-debug * \t\t Trace method calls\n"
@@ -202,7 +202,7 @@
"\t-oss <size> *\t\t ���w�̤j Java ���|�Ŷ�\n"
"\t-jar ���� JAR\n"
-#: kaffe/kaffe/main.c:765
+#: kaffe/kaffe/main.c:770
#, c-format
msgid ""
"\t-vmdebug <flag{,flag}>\t Internal VM debugging. Set flag=list for a list\n"
@@ -210,13 +210,13 @@
"\t-vmdebug <flag{,flag}>\t ���� VM �v�����A�]�w flag=list �i���o�������زM"
"��\n"
-#: kaffe/kaffe/main.c:768
+#: kaffe/kaffe/main.c:773
#, c-format
msgid "\t-vmstats <flag{,flag}>\t Print VM statistics. Set flag=all for all\n"
msgstr ""
"\t-vmstats <flag{,flag}>\t �L�C VM �έp�A�S�w flag=all �i���o��������\n"
-#: kaffe/kaffe/main.c:770
+#: kaffe/kaffe/main.c:775
#, c-format
msgid ""
" * Option currently ignored.\n"
Index: kaffe/replace/getaddrinfo.c
diff -u kaffe/replace/getaddrinfo.c:1.3 kaffe/replace/getaddrinfo.c:1.4
--- kaffe/replace/getaddrinfo.c:1.3 Mon Feb 2 00:10:59 2004
+++ kaffe/replace/getaddrinfo.c Wed Jun 30 19:37:31 2004
@@ -75,9 +75,9 @@
* fi
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+#endif
#include <sys/types.h>
#include <stdio.h>
@@ -103,7 +103,9 @@
#include <pthread.h>
#endif
-#include "gettext.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
#ifndef HAVE_MEMCPY
#define memcpy(d, s, n) bcopy((s), (d), (n))
@@ -589,4 +591,3 @@
return result;
}
-#endif /* !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) */
Index: kaffe/replace/memset.c
diff -u kaffe/replace/memset.c:1.1 kaffe/replace/memset.c:1.2
--- kaffe/replace/memset.c:1.1 Thu Jun 12 16:25:14 2003
+++ kaffe/replace/memset.c Wed Jun 30 19:37:31 2004
@@ -26,15 +26,25 @@
* SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#if !defined(HAVE_MEMSET)
-
#include <sys/types.h>
#include <stdio.h>
-void *
-memset(void * s, int c, size_t len)
+#ifdef __STDC__
+#define VOID void
+#else
+#define VOID char
+#endif
+
+VOID *
+memset(s, c, len)
+ VOID *s;
+ int c;
+ size_t len;
{
unsigned char *us = (unsigned char *)s;
unsigned char uc = (unsigned char)uc;
@@ -44,5 +54,4 @@
return s;
}
-
-#endif /* ! HAVE_MEMSET */
+#endif /* !defined(HAVE_MEMSET) */
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
