[ViewVC] Diff of: cvs/libptytty/src/ptytty.C

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.20 by root, Mon Jan 23 11:45:44 2006 UTC vs.
Revision 1.21 by root, Mon Jan 23 11:53:27 2006 UTC

 }
 void
 ptytty::use_helper ()
 {
+#ifndef PTYTTY_NO_PID_CHECK
   int pid = getpid ();
+#endif
-  if (sock_fd >= 0 && pid == owner_pid)
+  if (sock_fd >= 0
+#ifndef PTYTTY_NO_PID_CHECK
+      && pid == owner_pid
+#endif
+      )
     return;
+#ifndef PTYTTY_NO_PID_CHECK
   owner_pid = pid;
+#endif
   int sv[2];
   if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
     ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
 ptytty *
 ptytty::create ()
 {
 #if PTYTTY_HELPER
+  if (helper_pid
+# ifndef PTYTTY_NO_PID_CHECK
-  if (helper_pid && getpid () == owner_pid)
+      && getpid () == owner_pid
+# endif
+      )
     // use helper process
     return new ptytty_proxy;
   else
 #endif
     return new ptytty_unix;
 }
 /////////////////////////////////////////////////////////////////////////////
 // C API
-#ifndef NO_C_API
+#ifndef PTYTTY_NO_C_API
 #define DEFINE_METHOD(retval, name, args1, args2) \
 extern "C" retval ptytty_ ## name args1           \
 { return ((struct ptytty *)ptytty)->name args2; }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines