[svn-commits] tilghman: branch 1.6.2 r186302 - in /branches/1.6.2: ./ main/stdtime/localtime.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Apr  3 10:19:27 2009
New Revision: 186302

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186302
Log:
Merged revisions 186297 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186297 | tilghman | 2009-04-03 10:18:28 -0500 (Fri, 03 Apr 2009) | 4 lines
  
  Compatibility fix for glibc 2.4
  (Closes issue #14820)
  Reported by: phsultan
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/stdtime/localtime.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/stdtime/localtime.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/stdtime/localtime.c?view=diff&rev=186302&r1=186301&r2=186302
==============================================================================
--- branches/1.6.2/main/stdtime/localtime.c (original)
+++ branches/1.6.2/main/stdtime/localtime.c Fri Apr  3 10:19:27 2009
@@ -310,7 +310,11 @@
 			sp->wd[1] = -1;
 		}
 		/* or if the symlink itself changes (or the real file is here, if path is not a symlink) */
-		sp->wd[0] = inotify_add_watch(inotify_fd, path, IN_ATTRIB | IN_DELETE_SELF | IN_MODIFY | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_DONT_FOLLOW);
+		sp->wd[0] = inotify_add_watch(inotify_fd, path, IN_ATTRIB | IN_DELETE_SELF | IN_MODIFY | IN_MOVE_SELF | IN_CLOSE_WRITE
+#ifdef IN_DONT_FOLLOW   /* Only defined in glibc 2.5 and above */
+			| IN_DONT_FOLLOW
+#endif
+		);
 	}
 }
 #else