* Updated header: Added 2006. Changed address of FSF. Changed email

[cacao.git] / src / vm / utf8.h

diff --git a/src/vm/utf8.h b/src/vm/utf8.h
index 36814867b2a539b1bb3ae4421b7f4c54e1c244c9..81e233191d1795d76ccca75c25a1818cf0c0e0ef 100644 (file)
--- a/src/vm/utf8.h
+++ b/src/vm/utf8.h
@@ -1,9 +1,9 @@
 /* src/vm/utf.h - utf string header
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: utf8.h 3541 2005-11-03 20:33:51Z twisti $
+   $Id: utf8.h 4357 2006-01-22 23:33:38Z twisti $
 
 */
 
@@ -43,6 +43,8 @@
 
 typedef struct utf utf;
 
+#include "config.h"
+#include "vm/types.h"
 
 #include "vm/global.h"
 
@@ -51,7 +53,7 @@ typedef struct utf utf;
 
 struct utf {
        utf  *hashlink;                     /* link for external hash chain       */
-       int   blength;                      /* text length in bytes               */
+       s4    blength;                      /* text length in bytes               */
        char *text;                         /* pointer to text                    */
 };
 
@@ -77,6 +79,8 @@ extern utf *utf_java_lang_Throwable;
 extern utf *utf_java_lang_VMThrowable;
 extern utf *utf_java_lang_Error;
 extern utf *utf_java_lang_NoClassDefFoundError;
+extern utf *utf_java_lang_LinkageError;
+extern utf *utf_java_lang_NoSuchMethodError;
 extern utf *utf_java_lang_OutOfMemoryError;
 
 extern utf *utf_java_lang_Exception;
@@ -161,7 +165,8 @@ extern utf *array_packagename;
 
 /* function prototypes ********************************************************/
 
-void utf8_init(void);
+/* initialize the utf8 subsystem */
+bool utf8_init(void);
 
 u4 utf_hashkey(const char *text, u4 length);
 
@@ -171,9 +176,6 @@ u4 unicode_hashkey(u2 *text, u2 length);
 /* create new utf-symbol */
 utf *utf_new(const char *text, u2 length);
 
-/* without locking (caller already holding lock*/
-utf *utf_new_intern(const char *text, u2 length);
-
 /* make utf symbol from u2 array */
 utf *utf_new_u2(u2 *unicodedata, u4 unicodelength, bool isclassname);