- dtucker@cvs.openbsd.org 2014/01/18 09:36:26

     [session.c]
     explicitly define USE_PIPES to 1 to prevent redefinition warnings in
     portable on platforms that use pipes for everything.  From redhat @
     redhat.

diff --git a/ChangeLog b/ChangeLog
index f6167009700173436ddbda5f1543b4d6499a0069..d274fc4eaef48033ca64e8b4ea7e924ff0a24300 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - dtucker@cvs.openbsd.org 2014/01/17 06:23:24
      [sftp-server.c]
      fix log message statvfs.  ok djm
+   - dtucker@cvs.openbsd.org 2014/01/18 09:36:26
+     [session.c]
+     explicitly define USE_PIPES to 1 to prevent redefinition warnings in
+     portable on platforms that use pipes for everything.
 
 20140118
  - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin.  Patch

diff --git a/session.c b/session.c
index a0a0c2d9cb66e4fe6c5e99923e161864db6e9740..924c11bcc556cfe5efbca8817bb142c0ae36ff6d 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.268 2013/10/29 09:48:02 djm Exp $ */
+/* $OpenBSD: session.c,v 1.269 2014/01/18 09:36:26 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -441,7 +441,7 @@ do_authenticated1(Authctxt *authctxt)
        }
 }
 
-#define USE_PIPES
+#define USE_PIPES 1
 /*
  * This is called to fork and execute a command when we have no tty.  This
  * will call do_child from the child, and server_loop from the parent after