diff options
author | Robert Schuster <thebohemian@gmx.net> | 2008-07-10 15:59:04 +0000 |
---|---|---|
committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-10 15:59:04 +0000 |
commit | daca624e4b5f1363dc5ffaf333324e41746bf138 (patch) | |
tree | 27239de3f486e0d860293ab6cf83c81f67d41e40 /packages/classpath/files/javanet-local.patch | |
parent | 826c7fbb7c88eadd21abd948ef30182b6b281d06 (diff) |
classpath: Added patch fixing build on newer GCCs (and prevents a bug).
Diffstat (limited to 'packages/classpath/files/javanet-local.patch')
-rw-r--r-- | packages/classpath/files/javanet-local.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/packages/classpath/files/javanet-local.patch b/packages/classpath/files/javanet-local.patch new file mode 100644 index 0000000000..b8d1584e7c --- /dev/null +++ b/packages/classpath/files/javanet-local.patch @@ -0,0 +1,37 @@ +Index: native/jni/java-net/local.c +=================================================================== +RCS file: /sources/classpath/classpath/native/jni/java-net/local.c,v +retrieving revision 1.4 +diff -u -r1.4 local.c +--- native/jni/java-net/local.c 17 Apr 2007 21:46:27 -0000 1.4 ++++ native/jni/java-net/local.c 27 Jun 2008 13:14:40 -0000 +@@ -73,27 +73,18 @@ + return socket (PF_UNIX, stream ? SOCK_STREAM : SOCK_DGRAM, 0); + } + +-static int gcc_sucks = 0; +- + int + local_bind (int fd, const char *addr) + { + struct sockaddr_un saddr; + +- /* For some reason, GCC 4.0.1 on Darwin/x86 MODIFIES the `addr' +- pointer in the CALLER's STACK FRAME after calling this function, +- but if we add this statement below, it doesn't! */ +- if (gcc_sucks) +- fprintf (stderr, "bind %p\n", addr); +- +- if (strlen (addr) > sizeof (saddr.sun_path)) ++ if (strlen (addr) >= sizeof (saddr.sun_path)) + { + errno = ENAMETOOLONG; + return -1; + } + +- strncpy (saddr.sun_path, addr, sizeof (saddr.sun_path)); +- saddr.sun_path[sizeof (saddr.sun_path)] = '\0'; ++ strcpy (saddr.sun_path, addr); + saddr.sun_family = AF_LOCAL; + + return bind (fd, (struct sockaddr *) &saddr, SUN_LEN (&saddr)); |