ftp://ftp.uni-heidelberg.de/pub/X11/contrib/applications/xscreensaver-1.27.tar.Z

[xscreensaver] / driver / subprocs.c

diff --git a/driver/subprocs.c b/driver/subprocs.c
index 23eb0e44345bc4c979512285953fa33fbb49c61c..689bbb01654a78b09d326c86f1ebd4d6e6e50571 100644 (file)
--- a/driver/subprocs.c
+++ b/driver/subprocs.c
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1991-1993 Jamie Zawinski <jwz@lucid.com>
+/* xscreensaver, Copyright (c) 1991, 1992, 1993, 1995
+ *  Jamie Zawinski <jwz@netscape.com>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -80,14 +81,7 @@ extern int putenv (/* const char * */);      /* getenv() is in stdlib.h... */
 extern int kill (pid_t, int);          /* signal() is in sys/signal.h... */
 #endif
 
-# ifndef random
-#  if defined(SVR4) || defined(SYSV)
-#   define random() rand()
-#  else /* !totally-losing-SYSV */
-    extern long random();              /* rand() is in stdlib.h... */
-#  endif /* !totally-losing-SYSV */
-# endif /* random defined */
-
+#include "yarandom.h"
 #include "xscreensaver.h"
 
 /* this must be `sh', not whatever $SHELL happens to be. */
@@ -105,8 +99,12 @@ int nice_inferior = 0;
 extern Bool demo_mode_p;
 
 static void
+#if __STDC__
+exec_screenhack (char *command)
+#else
 exec_screenhack (command)
      char *command;
+#endif
 {
   char *tmp;
   char buf [512];
@@ -203,8 +201,12 @@ static Bool suspending = False;
 static char *current_hack_name P((void));
 
 static void
+#if __STDC__
+await_child_death (Bool killed)
+#else
 await_child_death (killed)
      Bool killed;
+#endif
 {
   Bool suspended_p = False;
   int status;