X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/e9eb6f14fe334d0e37d2037c952e6541eeb242ad..3f922c3769247bef882fb399abcb601a066f4a31:/src/s/aix4-2.h
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index b44bd0308a..49eabfc846 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,5 +1,5 @@
/*
-Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -26,31 +26,9 @@ along with GNU Emacs. If not, see . */
#define _AIX
#endif
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-#define SYSTEM_TYPE "aix"
-
-/* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
- To get the name of the slave side, you just ttyname() the master side. */
-#define PTY_ITERATION int c; for (c = 0; !c ; c++)
-#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
-#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
-
-/* Define HAVE_PTYS if the system supports pty devices. */
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-#define HAVE_SOCKETS
/* Special items needed to make Emacs run on this system. */
-/* AIX doesn't define this. */
-#define unix 1
-
-/* Perry Smith says these are correct. */
-#define SIGNALS_VIA_CHARACTERS
-#define CLASH_DETECTION
-
/* Perry Smith says these are correct. */
#undef sigmask
@@ -59,19 +37,6 @@ along with GNU Emacs. If not, see . */
#define NO_EDITRES
#endif
-/* 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 in configure,
- 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
- that 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
+/* Conservative garbage collection has not been tested, so for now
+ play it safe and stick with the old-fashioned way of marking. */
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE