merged volatile memory barriers

[cacao.git] / src / toolbox / util.h

diff --git a/src/toolbox/util.h b/src/toolbox/util.h
index 34ba66ee8ef148d3653e3dfb7606d1be0ab17d4e..fd1143b6549351a9f49b49f650e58eb0495e3d34 100644 (file)
--- a/src/toolbox/util.h
+++ b/src/toolbox/util.h
@@ -1,9 +1,7 @@
 /* src/toolbox/util.h - contains some utility functions
 
-   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, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -19,16 +17,8 @@
 
    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.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: util.h 2979 2005-07-11 09:59:37Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
@@ -36,13 +26,24 @@
 #ifndef _UTIL_H
 #define _UTIL_H
 
+#include "config.h"
+
 #include <stdarg.h>
 
+#include "vm/types.h"
+
 
 /* function prototypes ********************************************************/
 
-char *_Jv_getcwd(void);
-int get_variable_message_length(const char *fmt, va_list ap);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int   get_variable_message_length(const char *fmt, va_list ap);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _UTIL_H */