diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-01 17:10:06 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-01 17:10:06 +0000 |
| commit | 66130b43ceacdea52e5ce6b6f2cc2180adaefece (patch) | |
| tree | a820872fa7e9eb2084f6e8e177d38df430ea3131 | |
| parent | Merge more crypto related fixes for recent OpenSSL versions. (diff) | |
Add a better patch to say we have socklen_t.
Submitted by: tmm
Notes
Notes:
svn path=/head/; revision=81914
| -rw-r--r-- | devel/nspr/files/patch-..::configure | 13 | ||||
| -rw-r--r-- | devel/nspr/files/patch-nspr-unix.c | 21 |
2 files changed, 7 insertions, 27 deletions
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index b69e24479e5e..2122dd562194 100644 --- a/devel/nspr/files/patch-..::configure +++ b/devel/nspr/files/patch-..::configure @@ -1,13 +1,14 @@ - -$FreeBSD$ - ---- ../configure.orig Sat Mar 30 17:35:05 2002 -+++ ../configure Thu Aug 8 19:35:46 2002 -@@ -3290,16 +3290,17 @@ +--- ../configure.orig Wed Mar 26 21:21:19 2003 ++++ ../configure Sun Jun 1 13:08:11 2003 +@@ -3300,16 +3300,21 @@ #define HAVE_BSD_FLOCK 1 EOF - CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" ++ cat >> confdefs.h <<\EOF ++#define HAVE_SOCKLEN_T 1 ++EOF ++ + CFLAFS="$CFLAGS $DSO_CFLAGS -ansi -Wall -pipe -DXP_UNIX" MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` if test "$MOZ_OBJFORMAT" = "elf"; then diff --git a/devel/nspr/files/patch-nspr-unix.c b/devel/nspr/files/patch-nspr-unix.c deleted file mode 100644 index 1c4007c7542e..000000000000 --- a/devel/nspr/files/patch-nspr-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ ../pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t |