diff options
| author | Glenn Morris | 2012-08-06 16:29:45 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-06 16:29:45 -0400 |
| commit | 1db4583ad26f5052002a8a0869b69a02056717a3 (patch) | |
| tree | 84957bb0fb79e544971ae2f9d4cdacf90abbfb1d /src | |
| parent | 1c6f11f42ac2afa209124ce06e64b7a0461d7bdd (diff) | |
| download | emacs-1db4583ad26f5052002a8a0869b69a02056717a3.tar.gz emacs-1db4583ad26f5052002a8a0869b69a02056717a3.zip | |
Guard against potential configure bug wrt HAVE_GETWD
* configure.ac (BROKEN_GETWD) [unixware]: New define.
* src/sysdep.c: Respect BROKEN_GETWD.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/sysdep.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ec3f08fc6a0..5bccda264b2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-08-06 Glenn Morris <rgm@gnu.org> | 1 | 2012-08-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * sysdep.c: Respect BROKEN_GETWD. | ||
| 4 | |||
| 3 | * dispnew.c (GNU_LIBRARY_PENDING_OUTPUT_COUNT, PENDING_OUTPUT_COUNT): | 5 | * dispnew.c (GNU_LIBRARY_PENDING_OUTPUT_COUNT, PENDING_OUTPUT_COUNT): |
| 4 | Let configure handle it. | 6 | Let configure handle it. |
| 5 | (stdio_ext.h) [DISPNEW_NEEDS_STDIO_EXT]: Include it. | 7 | (stdio_ext.h) [DISPNEW_NEEDS_STDIO_EXT]: Include it. |
diff --git a/src/sysdep.c b/src/sysdep.c index b2b3556d125..d9e239d77c3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -1971,7 +1971,7 @@ emacs_readlink (char const *filename, char initial_buf[READLINK_BUFSIZE]) | |||
| 1971 | * under error conditions. | 1971 | * under error conditions. |
| 1972 | */ | 1972 | */ |
| 1973 | 1973 | ||
| 1974 | #ifndef HAVE_GETWD | 1974 | #if !defined (HAVE_GETWD) || defined (BROKEN_GETWD) |
| 1975 | 1975 | ||
| 1976 | #ifndef MAXPATHLEN | 1976 | #ifndef MAXPATHLEN |
| 1977 | /* In 4.1, param.h fails to define this. */ | 1977 | /* In 4.1, param.h fails to define this. */ |
| @@ -2001,7 +2001,7 @@ getwd (char *pathname) | |||
| 2001 | return pathname; | 2001 | return pathname; |
| 2002 | } | 2002 | } |
| 2003 | 2003 | ||
| 2004 | #endif /* HAVE_GETWD */ | 2004 | #endif /* !defined (HAVE_GETWD) || defined (BROKEN_GETWD) */ |
| 2005 | 2005 | ||
| 2006 | /* | 2006 | /* |
| 2007 | * This function will go away as soon as all the stubs fixed. (fnf) | 2007 | * This function will go away as soon as all the stubs fixed. (fnf) |