Changeset 45

Timestamp:

Jun 7, 2006, 10:30:17 PM (18 years ago)

Author:

rainer

Message:

Fix for broken compile with oracle

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/sh_database.c (modified) (7 diffs)

trunk/configure.ac

@@ -1138 +1138 @@
             fi
             LIBS="${LIBS} -L${ORACLE_LIB_DIR} ${ORACLE_LIBS}"
+            if test "x$GCC" != "xyes"; then
+              CFLAGS="${CFLAGS} -fno-strict-aliasing"
+            fi
           fi
           AC_DEFINE(WITH_ORACLE)

trunk/src/sh_database.c

@@ -522 +522 @@
     {
       if (str[len-1] == '\n')
-        str[len-1] == '\0';
+        str[len-1] = '\0';
     }
   return str;
@@ -687 +687 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
-          { 
-            ++retry; sh_database_reset(); goto oracle_doconnect; 
-          }
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
+        { 
+          ++retry; sh_database_reset(); goto oracle_doconnect; 
+        }
       goto err_out;
     }
@@ -706 +706 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
           { 
             ++retry; sh_database_reset(); goto oracle_doconnect; 
@@ -742 +742 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
           { 
             ++retry; sh_database_reset(); goto oracle_doconnect; 
@@ -760 +760 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
           { 
             ++retry; sh_database_reset(); goto oracle_doconnect; 
@@ -779 +779 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
           { 
             ++retry; sh_database_reset(); goto oracle_doconnect; 
@@ -795 +795 @@
                       _("sh_database_query"));
       if (retry == 0 && 
-          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9)) 
+          (3114 == o_errorcode || 0 == strncmp(o_errormsg, _("ORA-03114"), 9))) 
           { 
             ++retry; sh_database_reset(); goto oracle_doconnect;