Mercurial > emacs
changeset 65657:c6e45e9a83bf
* s/aix4-2.h (BROKEN_GET_CURRENT_DIR_NAME): Define
BROKEN_GET_CURRENT_DIR_NAME.
* sysdep.c (get_current_dir_name): Also define if
BROKEN_GET_CURRENT_DIR_NAME.
* m/ibmrs6000.h: Test for USG5, not USG5_4.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 23 Sep 2005 17:06:03 +0000 |
| parents | 55fcf5165d97 |
| children | 5bde6d4759d6 |
| files | src/ChangeLog src/m/ibmrs6000.h src/s/aix4-2.h src/sysdep.c |
| diffstat | 4 files changed, 30 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Sep 23 15:49:13 2005 +0000 +++ b/src/ChangeLog Fri Sep 23 17:06:03 2005 +0000 @@ -1,3 +1,13 @@ +2005-09-23 Dan Nicolaescu <dann@ics.uci.edu> + + * s/aix4-2.h (BROKEN_GET_CURRENT_DIR_NAME): Define + BROKEN_GET_CURRENT_DIR_NAME. + + * sysdep.c (get_current_dir_name): Also define if + BROKEN_GET_CURRENT_DIR_NAME. + + * m/ibmrs6000.h: Test for USG5, not USG5_4. + 2005-09-22 Kim F. Storm <storm@cua.dk> * xdisp.c (message_dolog): Add warning about GC and Lisp strings.
--- a/src/m/ibmrs6000.h Fri Sep 23 15:49:13 2005 +0000 +++ b/src/m/ibmrs6000.h Fri Sep 23 17:06:03 2005 +0000 @@ -112,7 +112,7 @@ #define OBJECTS_MACHINE hftctl.o #endif -#ifndef USG5_4 +#ifndef USG5 #define C_SWITCH_MACHINE -D_BSD #endif
--- a/src/s/aix4-2.h Fri Sep 23 15:49:13 2005 +0000 +++ b/src/s/aix4-2.h Fri Sep 23 17:06:03 2005 +0000 @@ -2,5 +2,23 @@ #undef ALIGN_DATA_RELOC +/* On AIX Emacs uses the gmalloc.c malloc implementation. But given + the way this system works, libc functions that return malloced + memory use the libc malloc implementation. Calling xfree or + xrealloc on the results of such functions results in a crash. + + One solution for this could be to define SYSTEM_MALLOC here, but + that does not currently work on this system. + + It is possible to completely override the malloc implementation on + AIX, but that involves putting the malloc functions in a shared + library and setting the MALLOCTYPE environment variable to point to + tha shared library. + + Emacs currently calls xrealloc on the results of get_current_dir name, + to avoid a crash just use the Emacs implementation for that function. +*/ +#define BROKEN_GET_CURRENT_DIR_NAME 1 + /* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562 (do not change this comment) */
--- a/src/sysdep.c Fri Sep 23 15:49:13 2005 +0000 +++ b/src/sysdep.c Fri Sep 23 17:06:03 2005 +0000 @@ -256,7 +256,7 @@ SIGMASKTYPE sigprocmask_set; -#ifndef HAVE_GET_CURRENT_DIR_NAME +#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME) /* Return the current working directory. Returns NULL on errors. Any other returned value must be freed with free. This is used