summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-07-12 14:14:31 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-07-12 14:14:31 +1000
commit248469bc8d6c001596fdd3a83c1ffc63ae466e5b (patch)
tree9bb895755ccbdd68742c3f96950ce07efbb7850c /defines.h
parente0e4aad1fdd8770283798eede1297f363b43498d (diff)
downloadopenssh-git-248469bc8d6c001596fdd3a83c1ffc63ae466e5b.tar.gz
- (dtucker) [configure.ac defines.h] Only define SHUT_RD (and friends) and O_NONBLOCK
if they're really needed. Fixes build errors on HP-UX, old Linuxes and probably more.
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/defines.h b/defines.h
index f2fdd3ca..4dccc917 100644
--- a/defines.h
+++ b/defines.h
@@ -25,12 +25,12 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.132 2006/05/15 07:17:30 dtucker Exp $ */
+/* $Id: defines.h,v 1.133 2006/07/12 04:14:31 dtucker Exp $ */
/* Constants */
-#ifndef SHUT_RDWR
+#if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0
enum
{
SHUT_RD = 0, /* No more receptions. */
@@ -90,8 +90,8 @@ enum
#endif
#endif
-#ifndef O_NONBLOCK /* Non Blocking Open */
-# define O_NONBLOCK 00004
+#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0
+# define O_NONBLOCK 00004 /* Non Blocking Open */
#endif
#ifndef S_ISDIR