OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2003 17:14:51
Branch: HEAD Handle: 2003101516145100
Modified files:
openpkg-src/openpkg rpm.patch.porting
Log:
Workaround even more GCC'isms
Summary:
Revision Changes Path
1.35 +14 -2 openpkg-src/openpkg/rpm.patch.porting
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.34 -r1.35 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 15 Oct 2003 11:51:49 -0000 1.34
+++ openpkg-src/openpkg/rpm.patch.porting 15 Oct 2003 15:14:51 -0000 1.35
@@ -540,7 +540,7 @@
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 15 Oct 2003 11:48:23 -0000
++++ rpmio/fts.c 15 Oct 2003 15:12:49 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -564,7 +564,19 @@
#include "system.h"
#include "fts.h"
#include "rpmio.h"
-@@ -107,9 +116,13 @@
+@@ -73,7 +82,11 @@
+ /* 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)
++#endif
+ #endif
+ /* Align P to that size. */
+ #ifndef ALIGN
+@@ -107,9 +120,13 @@
/[EMAIL PROTECTED] fileSystem, internalState @*/;
#ifndef MAX
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
