aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-07-06 21:03:46 -0400
committerGlenn Morris2012-07-06 21:03:46 -0400
commit4516fbef7207ca23ca72da28d060dad979319310 (patch)
treeaff14f94e05168a85e2b92dbc026fcc75a9f0909 /src
parent07adc2c63b17a5829879886901cb731483a469cd (diff)
downloademacs-4516fbef7207ca23ca72da28d060dad979319310.tar.gz
emacs-4516fbef7207ca23ca72da28d060dad979319310.zip
Replace some src/s undefs by never even checking on relevant platforms
* configure.in: (getwd): Don't check for it on unixware. (random, rint): Don't check for these on hpux. (res_init, libresolv): Don't check for these on darwin. * src/s/darwin.h (HAVE_RES_INIT, HAVE_LIBRESOLV): * src/s/hpux10-20.h (HAVE_RINT, HAVE_RANDOM): * src/s/unixware.h (HAVE_GETWD): Move undefs to configure (effectively).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/s/darwin.h5
-rw-r--r--src/s/hpux10-20.h13
-rw-r--r--src/s/unixware.h3
4 files changed, 8 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ef2d06dc5b0..03c92804fb8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-07-07 Glenn Morris <rgm@gnu.org>
2
3 * s/darwin.h (HAVE_RES_INIT, HAVE_LIBRESOLV):
4 * s/hpux10-20.h (HAVE_RINT, HAVE_RANDOM):
5 * s/unixware.h (HAVE_GETWD): Move undefs to configure (effectively).
6
12012-07-07 Juanma Barranquero <lekktu@gmail.com> 72012-07-07 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)): 9 * makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)):
diff --git a/src/s/darwin.h b/src/s/darwin.h
index ce86bc5f578..b042630ee91 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -106,11 +106,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
106#define SYSTEM_PURESIZE_EXTRA 200000 106#define SYSTEM_PURESIZE_EXTRA 200000
107#endif 107#endif
108 108
109/* On Darwin, res_init appears not to be useful: see bug#562 and
110 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html */
111#undef HAVE_RES_INIT
112#undef HAVE_LIBRESOLV
113
114#ifdef emacs 109#ifdef emacs
115#define malloc unexec_malloc 110#define malloc unexec_malloc
116#define realloc unexec_realloc 111#define realloc unexec_realloc
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 683837891f4..62bb0f4e344 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -61,23 +61,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
61 HP-UX 10.20, and that it works for HP-UX 0 as well. */ 61 HP-UX 10.20, and that it works for HP-UX 0 as well. */
62#define NO_EDITRES 62#define NO_EDITRES
63 63
64/* Eric Backus <ericb@lsid.hp.com> says, HP-UX 9.x on HP 700 machines
65 has a broken `rint' in some library versions including math library
66 version number A.09.05.
67
68 You can fix the math library by installing patch number PHSS_4630.
69 But we can fix it more reliably for Emacs like this. */
70#undef HAVE_RINT
71
72/* We have to go this route, rather than hpux9's approach of renaming the 64/* We have to go this route, rather than hpux9's approach of renaming the
73 functions via macros. The system's stdlib.h has fully prototyped 65 functions via macros. The system's stdlib.h has fully prototyped
74 declarations, which yields a conflicting definition of srand48; it 66 declarations, which yields a conflicting definition of srand48; it
75 tries to redeclare what was once srandom to be srand48. So we go 67 tries to redeclare what was once srandom to be srand48. So we go
76 with HAVE_LRAND48 being defined. */ 68 with HAVE_LRAND48 being defined.
69 Note we also undef HAVE_RANDOM via configure. */
77#undef srandom 70#undef srandom
78#undef random 71#undef random
79#undef HAVE_RANDOM
80
81 72
82/* Rainer Malzbender <rainer@displaytech.com> says defining 73/* Rainer Malzbender <rainer@displaytech.com> says defining
83 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ 74 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 18d24b28507..1f35287f6d1 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -20,9 +20,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21#include "usg5-4-common.h" 21#include "usg5-4-common.h"
22 22
23/* #define HAVE_GETWD (appears to be buggy on SVR4.2) */
24#undef HAVE_GETWD
25
26/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock 23/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
27 rather than sighold/sigrelse, which appear to be BSD4.1 specific. 24 rather than sighold/sigrelse, which appear to be BSD4.1 specific.
28 It may also be appropriate for SVR4.x 25 It may also be appropriate for SVR4.x