diff options
| author | Justin M. Seger <jseger@FreeBSD.org> | 2000-07-30 03:45:10 +0000 |
|---|---|---|
| committer | Justin M. Seger <jseger@FreeBSD.org> | 2000-07-30 03:45:10 +0000 |
| commit | 348a8f1b9d9507ea13c2490d6a12aa5d0b6b5a2a (patch) | |
| tree | 4dab324ff31b0c943ada9bada7f277349077933c /editors/emacs20/files/patch-cg | |
| parent | Activate BibleReader. (diff) | |
patch-ai, patch-an, patch-cg: Regenerated for emacs-20.7.
patch-cc (configure.in): Merged with patch-ch.
patch-af (src/unexfreebsd.c): Removed. Not used by this port.
patch-ca (src/Makefile.in): Removed. 5-CURRENT's and
4-STABLE's libtermcap -> libncurses symbolic link issues
are now well handled by vendor's src/s/freebsd.h.
Moved LIBS_XPG changes to patch-cb.
patch-cb (src/s/freebsd.h): Regenerate for emacs-20.7.
Update the conditional of enclosing the USE_XPG check
so as not to link libxpg4 on recently 5-CURRENT and
4-STABLE after the merge of libxpg4 into libc.
Added LIBS_XPG to LIBS_SYSTEM.
PR: ports/19653
Submitted by: OKAZAKI Tetsurou <okazaki@be.to>
Diffstat (limited to 'editors/emacs20/files/patch-cg')
| -rw-r--r-- | editors/emacs20/files/patch-cg | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/editors/emacs20/files/patch-cg b/editors/emacs20/files/patch-cg index 1973aff47d10..b1087db71b9e 100644 --- a/editors/emacs20/files/patch-cg +++ b/editors/emacs20/files/patch-cg @@ -1,5 +1,5 @@ ---- src/process.c-dist Fri Aug 14 22:51:44 1998 -+++ src/process.c Fri Jul 30 12:21:11 1999 +--- src/process.c.orig Wed May 24 04:10:16 2000 ++++ src/process.c Sat Jul 1 20:37:08 2000 @@ -1,7 +1,18 @@ +/* + * Locally hacked process.c to add ipv6 support. -wsr @@ -19,7 +19,7 @@ This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify -@@ -1808,15 +1819,22 @@ +@@ -1810,15 +1821,22 @@ { Lisp_Object proc; register int i; @@ -45,7 +45,7 @@ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int retry = 0; int count = specpdl_ptr - specpdl; -@@ -1829,6 +1847,22 @@ +@@ -1831,6 +1849,22 @@ GCPRO4 (name, buffer, host, service); CHECK_STRING (name, 0); CHECK_STRING (host, 0); @@ -68,8 +68,8 @@ if (INTEGERP (service)) port = htons ((unsigned short) XINT (service)); else -@@ -1839,6 +1873,8 @@ - error ("Unknown service \"%s\"", XSTRING (service)->data); +@@ -1841,6 +1875,8 @@ + error ("Unknown service \"%s\"", XSTRING (service)->data); port = svc_info->s_port; } +#endif /* HAVE_GETADDRINFO */ @@ -77,7 +77,7 @@ /* Slow down polling to every ten seconds. Some kernels have a bug which causes retrying connect to fail -@@ -1848,6 +1884,62 @@ +@@ -1850,6 +1886,62 @@ #endif #ifndef TERM @@ -140,10 +140,11 @@ while (1) { #ifdef TRY_AGAIN -@@ -1938,6 +2030,7 @@ +@@ -1940,6 +2032,7 @@ report_file_error ("connection failed", - Fcons (host, Fcons (name, Qnil))); + Fcons (host, Fcons (name, Qnil))); } +#endif /* HAVE_GETADDRINFO */ immediate_quit = 0; + |