Changeset 465 for trunk

Timestamp:

Mar 8, 2015, 6:02:28 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #364 (gcc 4.9 compiler bugs).

Location:

trunk/src

Files:

• sh_files.c (modified) (2 diffs)
• sh_inotify.c (modified) (1 diff)
• sh_nmail.c (modified) (1 diff)
• zAVLTree.c (modified) (1 diff)

trunk/src/sh_files.c

@@ -589 +589 @@
   return zAVL_string_get (fileTree, path);
 }
+
+static void * sh_dummy_candidate;
+
 static char * intern_find_morespecific_dir(zAVLTree * tree, 
                                            const char * path, size_t * len)
@@ -601 +604 @@
   if (NULL == tree)
     return NULL;
+
+  sh_dummy_candidate = (void *) &candidate;
 
   SH_MUTEX_LOCK(mutex_zfiles);

trunk/src/sh_inotify.c

@@ -21 +21 @@
 
 #if defined(HAVE_SYS_INOTIFY_H)
+
+#if defined(GCC_VERSION_MAJOR)
+#if (GCC_VERSION_MAJOR > 4) || ((GCC_VERSION_MAJOR == 4) && (GCC_VERSION_MINOR > 8))
+#pragma GCC diagnostic ignored "-Wclobbered"
+#endif
+#endif
 
 #undef  FIL__

trunk/src/sh_nmail.c

@@ -22 +22 @@
 #if defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
 #define _XOPEN_SOURCE 500
+#endif
+
+#if defined(GCC_VERSION_MAJOR)
+#if (GCC_VERSION_MAJOR > 4) || ((GCC_VERSION_MAJOR == 4) && (GCC_VERSION_MINOR > 8))
+#pragma GCC diagnostic ignored "-Wclobbered"
+#endif
 #endif
 

trunk/src/zAVLTree.c

@@ -39 +39 @@
   return (zAVLKey) arg;
 }
+static char * dummy_zfree_string;
 static void zfree_string (void * inptr)
 {
   char * str = (char *) inptr;
+
+  /* Take the address to circumvent gcc 4.9 optimizer bug */
+  dummy_zfree_string = (char *) &inptr;
+
   str[0] = '\0';
-  free (str);
+  free (inptr);
   return;
 }