2 files changed, 3 insertions, 18 deletions
diff --git a/libjava/include/posix-signal.h b/libjava/include/posix-signal.h
index 726fde3a66e..7be37f59b1f 100644
--- a/libjava/include/posix-signal.h
+++ b/libjava/include/posix-signal.h
@@ -1,6 +1,6 @@
 // posix-signal.h - Catch runtime signals and turn them into exceptions.
 
-/* Copyright (C) 1998, 1999, 2000, 2009, 2011  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2009, 2011, 2012 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -20,8 +20,7 @@ details.  */
    SA_SIGINFO being set or fail if so.  Cf. gcc/ada/init.c
    (__gnat_install_handler) for details.  */
 
-#if (defined __alpha__ && defined __osf__) \
-  || (defined __sun__ && defined __svr4__)
+#if defined __sun__ && defined __svr4__
 #define SA_FLAGS SA_NODEFER | SA_SIGINFO
 #elif defined __sgi__
 #define SA_FLAGS SA_NODEFER
diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index c49da05eb11..6bd560c5a23 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, 2006, 2010  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003, 2006, 2010, 2012  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -11,11 +11,6 @@ details.  */
 #ifndef __JV_POSIX_H__
 #define __JV_POSIX_H__
 
-/* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of
-   socket functions with socklen_t instead of size_t.  This must be defined
-   early so <standards.h> defines the correct version of __PIIX.  */
-#define _POSIX_PII_SOCKET
-
 #include <time.h>
 #include <sys/types.h>
 
@@ -155,15 +150,6 @@ _Jv_bind (int fd, struct sockaddr *addr, int addrlen)
 
 #undef bind
 
-// Same problem with accept on Tru64 UNIX with _POSIX_PII_SOCKET
-inline int
-_Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
-{
-  return ::accept (fd, addr, addrlen);
-}
-
-#undef accept
-
 inline int
 _Jv_listen (int fd, int backlog)
 {