Kaynağa Gözat

fix workaround for GCC'ism

Ralf S. Engelschall 22 yıl önce
ebeveyn
işleme
4f92c6f1df
1 değiştirilmiş dosya ile 5 ekleme ve 4 silme
  1. 5 4
      openpkg/rpm.patch.porting

+ 5 - 4
openpkg/rpm.patch.porting

@@ -540,7 +540,7 @@ Index: rpmio/Makefile.in
 +---------------------------------------------------------------------------
 Index: rpmio/fts.c
 --- rpmio/fts.c	18 Jan 2003 16:13:17 -0000	1.1.1.3
-+++ rpmio/fts.c	15 Oct 2003 15:12:49 -0000
++++ rpmio/fts.c	15 Oct 2003 18:15:29 -0000
 @@ -34,6 +34,8 @@
  static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
  #endif /* LIBC_SCCS and not lint */
@@ -564,19 +564,20 @@ Index: rpmio/fts.c
  #include "system.h"
  #include "fts.h"
  #include "rpmio.h"
-@@ -73,7 +82,11 @@
+@@ -73,7 +82,12 @@
  /* Largest alignment size needed, minus one.
     Usually long double is the worst case.  */
  #ifndef ALIGNBYTES
 +#if defined(__GNUC__)
  #define ALIGNBYTES	(__alignof__ (long double) - 1)
 +#else
-+#define ALIGNBYTES	((long double) - 1)
++/* not accurate enough (usually too large), but sufficient (and this way equal safe) */
++#define ALIGNBYTES	(sizeof (long double) - 1)
 +#endif
  #endif
  /* Align P to that size.  */
  #ifndef ALIGN
-@@ -107,9 +120,13 @@
+@@ -107,9 +121,13 @@
  	/*@modifies fileSystem, internalState @*/;
  
  #ifndef MAX