Changeset 46 for trunk/src

Timestamp:

Jun 9, 2006, 10:38:20 PM (18 years ago)

Author:

rainer

Message:

Fix x86_64 build failure with gcc 4.x (as well as some gcc 4.x warnings)

Location:

trunk/src

Files:

• sh_files.c (modified) (2 diffs)
• sh_socket.c (modified) (1 diff)
• sh_tiger0.c (modified) (1 diff)
• sh_tiger1_64.c (modified) (1 diff)

trunk/src/sh_files.c

@@ -204 +204 @@
   char       * dir;
   char       * file;
+  int          tmp_reported;
   
   SL_ENTER(_("sh_files_chk"));
@@ -233 +234 @@
 
           BREAKEXIT(sh_files_filecheck);
+          tmp_reported = ptr->reported; /* fix aliasing warning */ 
           status = sh_files_filecheck (ptr->class, dir, file, 
-                                       (int *) &(ptr->reported), 0);
+                                       &tmp_reported, 0);
+          ptr->reported = tmp_reported;
           
           TPT(( 0, FIL__, __LINE__, 

trunk/src/sh_socket.c

@@ -522 +522 @@
 #elif defined(SO_PEERCRED) 
   struct ucred cr;
-  int          cl = sizeof(cr);
+#ifdef HAVE_SOCKLEN_T
+  socklen_t cl = sizeof(cr);
+#else
+  int       cl = sizeof(cr);
+#endif 
 
 #elif defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS))

trunk/src/sh_tiger0.c

@@ -913 +913 @@
       sum += n;
     }
-    while (sum < (off_t) BLOCKSIZE 
+    while (sum < (size_t) BLOCKSIZE 
            && n != 0);
 

trunk/src/sh_tiger1_64.c

@@ -129 +129 @@
 #define roundend(a,b,c,x) \
  : "+r" (a), "+r" (b), "+r" (c) \
- : "0" (a), "1" (b), "2" (c), "m" (x), "r" (&tiger_table),\
+ : "r" (a), "r" (b), "r" (c), "m" (x), "r" (&tiger_table),\
   "i" (MASK0), "i" (MASK8), "i" (MASK16), "r" (MASK32), "r" (MASK40), "r" (MASK48) \
  : "3", "%rax","%rbx","%rcx","%rdx","%rsi", "%edi", "%r8"  );