Changeset 377 for trunk/src

Timestamp:

Nov 5, 2011, 11:57:44 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #272 (Compile errors on RHEL5, gcc 4.1.2).

Location:

trunk/src

Files:

• sh_files.c (modified) (5 diffs)
• sh_inotify.c (modified) (1 diff)

trunk/src/sh_files.c

@@ -19 +19 @@
 
 #include "config_xor.h"
+
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
+#define _XOPEN_SOURCE 500
+#endif
 
 #include <stdio.h>
@@ -1455 +1459 @@
     }
  out:
+  ; /* 'label at end of compound statement' */
   SH_MUTEX_RECURSIVE_UNLOCK(mutex_zdirs);
 
@@ -1881 +1886 @@
   int             rdepth = 0;
   int             class  = 0;
-  int             rdepth_next;
+  volatile int    rdepth_next;
   int             class_next;
   volatile int    file_class_next;
@@ -2727 +2732 @@
 #endif
  out:
+  ; /* 'label at end of compound statement' */
   SH_MUTEX_RECURSIVE_UNLOCK(mutex_zdirs);
   return retval;
@@ -2774 +2780 @@
 #endif
  out:
+  ; /* 'label at end of compound statement' */
   SH_MUTEX_UNLOCK(mutex_zfiles);
   return retval;

trunk/src/sh_inotify.c

@@ -666 +666 @@
     }
  retpoint:
+  ; /* 'label at end of compound statement' */
   SH_MUTEX_UNLOCK(mutex_watches);
   return retval;