summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--defines.h6
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e42553ec..e7f49ea7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
70 allow "ssh-add - < key"; feedback and ok markus@ 70 allow "ssh-add - < key"; feedback and ok markus@
71 - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE 71 - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE
72 so autoreconf 2.68 is happy. 72 so autoreconf 2.68 is happy.
73 - (tim) [defines.h] Deal with platforms that do not have S_IFSOCK ok djm@
73 74
7420110221 7520110221
75 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 76 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/defines.h b/defines.h
index b67cf467d..a435de76e 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */ 28/* $Id: defines.h,v 1.166 2011/05/05 06:06:59 tim Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -131,6 +131,10 @@ enum
131# define O_NONBLOCK 00004 /* Non Blocking Open */ 131# define O_NONBLOCK 00004 /* Non Blocking Open */
132#endif 132#endif
133 133
134#ifndef S_IFSOCK
135# define S_IFSOCK 0
136#endif /* S_IFSOCK */
137
134#ifndef S_ISDIR 138#ifndef S_ISDIR
135# define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR)) 139# define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
136#endif /* S_ISDIR */ 140#endif /* S_ISDIR */