(HAVE_VFORK): Deleted.

(vfork): Define as emacs_vfork.

diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h
index 1a05089b2152854a7489d81af74d8071f06ed19f..21a74ca35207cee75cc610f693cf3c20d2f6aa6f 100644 (file)
--- a/src/s/sol2-4.h
+++ b/src/s/sol2-4.h
@@ -4,6 +4,11 @@
 
 #define SOLARIS2_4
 
+/* Solaris 2.4 has a broken vfork.  And a header file has a declaration 
+   that conflicts with the definition of vfork in sysdep.c.
+   This definition should avoid it.  */
+#define vfork emacs_vfork
+
 /* Get rid of -traditional and let const really do its thing.  */
 
 #ifdef __GNUC__
@@ -11,9 +16,7 @@
 #undef const
 #endif /* __GNUC__ */
 
-#define HAVE_VFORK
-
-/* solaris does POSIX signals.  this bit is from s/usg-5-4-2.h */
+/* Solaris does POSIX signals.  This is copied from s/usg-5-4-2.h.  */
 
 #define POSIX_SIGNALS
 #undef sigsetmask