2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>

[pf3gnuchains/gcc-fork.git] / libjava / include / win32.h

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index 3de6f11..a461d88 100644 (file)
--- 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.
 
@@ -11,7 +11,7 @@ details.  */
 #ifndef __JV_WIN32_H__
 #define __JV_WIN32_H__
 
-// Enable UNICODE Support.?
+// Enable UNICODE support?
 
 #ifdef MINGW_LIBGCJ_UNICODE
 #define UNICODE
@@ -22,6 +22,8 @@ details.  */
 
 // Includes
 #define WIN32_LEAN_AND_MEAN
+// Force Winsock 2 interface.
+#include <winsock2.h>
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 #undef STRICT
@@ -93,25 +95,36 @@ extern jstring _Jv_Win32NewString (LPCTSTR pcsz);
 /* Useful helper classes and methods. */
 
 /* A C++ wrapper around a WSAEVENT which closes the event
-        in its destructor. If dwSelFlags is non-zero, we also
-        issue an WSAEventSelect on the socket descriptor with
-        the given flags; this is undone by a corresponding call
-        to WSAEventSelect(fd, 0, 0) in our destructor. */
+   in its destructor. If dwSelFlags is non-zero, we also
+   issue an WSAEventSelect on the socket descriptor with
+   the given flags; this is undone by a corresponding call
+   to WSAEventSelect(fd, 0, 0) in our destructor. */
 class WSAEventWrapper
 {
 public:
-       WSAEventWrapper(int fd, DWORD dwSelFlags);
-       ~WSAEventWrapper();
+  // Default constructor. Call init() after this.
+  WSAEventWrapper();
+  WSAEventWrapper(int fd, DWORD dwSelFlags);
+  ~WSAEventWrapper();
 
-       WSAEVENT getEventHandle()
-       {
-               return m_hEvent;
-       }
+  // Used for two-step initialization after calling
+  // default constructor.
+  void init(int fd, DWORD dwSelFlags);
+
+  int getFD()
+  {
+    return m_fd;
+  }
+
+  WSAEVENT getEventHandle()
+  {
+    return m_hEvent;
+  }
 
 private:
-       WSAEVENT m_hEvent;
-       int m_fd;
-       DWORD m_dwSelFlags;
+  WSAEVENT m_hEvent;
+  int m_fd;
+  DWORD m_dwSelFlags;
 };
 
 // Error string text. The int argument is compatible
@@ -141,7 +154,7 @@ _Jv_ThrowSocketException ();
 extern void _Jv_platform_initialize (void);
 extern void _Jv_platform_initProperties (java::util::Properties*);
 extern jlong _Jv_platform_gettimeofday ();
-extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern jlong _Jv_platform_nanotime ();
 extern int _Jv_pipe (int filedes[2]);
 
 extern void
@@ -162,8 +175,11 @@ _Jv_platform_usleep (unsigned long usecs)
 }
 #endif /* JV_HASH_SYNCHRONIZATION */
 
-/* Store up to SIZE return address of the current program state in
-   ARRAY and return the exact number of values stored.  */
-extern int backtrace (void **__array, int __size);
+// Forward declaration.  See java-stack.h for definition.
+struct _Jv_AddrInfo;
+
+// Given an address, determine the executable or shared object that defines
+// it and the nearest named symbol.
+extern int _Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info);
 
 #endif /* __JV_WIN32_H__ */