From e59a1e40f318e53c11a069140e4380ca05dd75cd Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 9 Mar 2006 18:47:54 +0000 Subject: win32.cc (_Jv_platform_nanotime): New function. * win32.cc (_Jv_platform_nanotime): New function. * include/win32.h (_Jv_platform_nanotime): Declare. * posix.cc (_Jv_platform_nanotime): New function. * include/posix.h (_Jv_platform_nanotime): Declare. * java/lang/natSystem.cc (nanoTime): New method. * java/lang/System.java (nanoTime): Declare. * include/config.h.in, configure: Rebuilt. * configure.ac: Check for clock_gettime. From-SVN: r111869 --- libjava/include/Makefile.in | 4 ++++ libjava/include/config.h.in | 3 +++ libjava/include/posix.h | 3 ++- libjava/include/win32.h | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 7a2a10a..f5bea2f 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -141,7 +141,10 @@ JAVA_HOME = @JAVA_HOME@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ JC1GCSPEC = @JC1GCSPEC@ +LD = @LD@ LDFLAGS = @LDFLAGS@ +LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ +LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ LIBART_CFLAGS = @LIBART_CFLAGS@ LIBART_LIBS = @LIBART_LIBS@ LIBFFI = @LIBFFI@ @@ -234,6 +237,7 @@ ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_GCJ = @ac_ct_GCJ@ +ac_ct_LD = @ac_ct_LD@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 6f74e32..891a713 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -61,6 +61,9 @@ /* Define to 1 if you have the `chmod' function. */ #undef HAVE_CHMOD +/* Define if you have clock_gettime() */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the header file. */ #undef HAVE_DIRENT_H diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 28ac243..4ceb008 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -1,6 +1,6 @@ // posix.h -- Helper functions for POSIX-flavored OSs. -/* Copyright (C) 2000, 2002, 2003 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003, 2006 Free Software Foundation This file is part of libgcj. @@ -79,6 +79,7 @@ details. */ extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *); extern jlong _Jv_platform_gettimeofday (); +extern jlong _Jv_platform_nanotime (); extern void _Jv_platform_initialize (void); extern void _Jv_platform_initProperties (java::util::Properties*); diff --git a/libjava/include/win32.h b/libjava/include/win32.h index a660616..3e2beab 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -1,6 +1,6 @@ // win32.h -- Helper functions for Microsoft-flavored OSs. -/* Copyright (C) 2002, 2003 Free Software Foundation +/* Copyright (C) 2002, 2003, 2006 Free Software Foundation This file is part of libgcj. @@ -154,6 +154,7 @@ _Jv_ThrowSocketException (); extern void _Jv_platform_initialize (void); extern void _Jv_platform_initProperties (java::util::Properties*); extern jlong _Jv_platform_gettimeofday (); +extern jlong _Jv_platform_nanotime (); extern int _Jv_pipe (int filedes[2]); extern void -- cgit v1.1