No need to protect the type-correct prototypes with #ifdef _LP64

Fixes problems caused by types changes.  OK kurt@
This commit is contained in:
millert 2006-01-17 14:28:19 +00:00
parent 37eb3160dd
commit be2c89c95d
2 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-j2se_src_share_hpi_include_hpi_impl_h,v 1.1 2006/01/17 14:28:19 millert Exp $
--- j2se/src/share/hpi/include/hpi_impl.h.orig Thu Jan 12 18:01:13 2006
+++ j2se/src/share/hpi/include/hpi_impl.h Thu Jan 12 18:01:48 2006
@@ -120,21 +120,12 @@ int sysConnect(int fd, struct sockaddr *
int sysBind(int fd, struct sockaddr *him, int len);
int sysAccept(int fd, struct sockaddr *him, int *len);
int sysGetSockName(int fd, struct sockaddr *him, int *len);
-#ifdef _LP64
ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
int tolen);
ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
struct sockaddr *from, int *fromlen);
ssize_t sysRecv(int fd, char *buf, int nBytes, int flags);
ssize_t sysSend(int fd, char *buf, int nBytes, int flags);
-#else
-int sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
- int tolen);
-int sysRecvFrom(int fd, char *buf, int nbytes, int flags,
- struct sockaddr *from, int *fromlen);
-int sysRecv(int fd, char *buf, int nBytes, int flags);
-int sysSend(int fd, char *buf, int nBytes, int flags);
-#endif
int sysListen(int fd, int count);
int sysTimeout(int fd, long timeout);
int sysGetHostName(char* name, int namelen);

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-j2se_src_share_native_java_util_zip_Inflater_c,v 1.1 2006/01/17 14:28:19 millert Exp $
--- j2se/src/share/native/java/util/zip/Inflater.c.orig Wed Sep 10 21:53:39 2003
+++ j2se/src/share/native/java/util/zip/Inflater.c Thu Jan 12 19:34:45 2006
@@ -19,13 +19,6 @@
#include "jni_util.h"
#include "zlib.h"
-#ifndef _LP64
-/* avoid platform-dependent include files */
-
-extern int read(int fildes, void *buf, size_t nbyte);
-#endif
-
-
#include "java_util_zip_Inflater.h"
#define ThrowDataFormatException(env, msg) \