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 @@
      allow "ssh-add - < key"; feedback and ok markus@
  - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE
    so autoreconf 2.68 is happy.
+ - (tim) [defines.h] Deal with platforms that do not have S_IFSOCK ok djm@
 
 20110221
  - (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 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
+/* $Id: defines.h,v 1.166 2011/05/05 06:06:59 tim Exp $ */
 
 
 /* Constants */
@@ -131,6 +131,10 @@ enum
 # define O_NONBLOCK      00004  /* Non Blocking Open */
 #endif
 
+#ifndef S_IFSOCK
+# define S_IFSOCK 0
+#endif /* S_IFSOCK */
+
 #ifndef S_ISDIR
 # define S_ISDIR(mode)  (((mode) & (_S_IFMT)) == (_S_IFDIR))
 #endif /* S_ISDIR */