OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   27-Aug-2003 12:10:19
  Branch: HEAD                             Handle: 2003082711101800

  Modified files:
    openpkg-src/openpkg     rpm.patch.porting

  Log:
    fix clash with non-GCC compiler and 'inline' attribute

  Summary:
    Revision    Changes     Path
    1.10        +24 -0      openpkg-src/openpkg/rpm.patch.porting
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.porting
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 rpm.patch.porting
  --- openpkg-src/openpkg/rpm.patch.porting     26 Aug 2003 13:55:17 -0000      1.9
  +++ openpkg-src/openpkg/rpm.patch.porting     27 Aug 2003 10:10:18 -0000      1.10
  @@ -653,3 +653,27 @@
    # define GETMNTENT_ONE 0
    # define GETMNTENT_TWO 0
    # if HAVE_SYS_MNTCTL_H
  ++---------------------------------------------------------------------------
  +| Drop GCC inline attribute when not compiling with GCC
  ++---------------------------------------------------------------------------
  +Index: system.h
  +--- system.h.dist    2003-08-27 10:29:28.000000000 +0200
  ++++ system.h 2003-08-27 11:19:01.000000000 +0200
  +@@ -599,11 +599,16 @@
  + 
  + #if defined(__LCLINT__)
  + #define FILE_RCSID(id)
  +-#else
  ++#elif defined(__GNUC__)
  + #define FILE_RCSID(id) \
  + static inline const char *rcsid(const char *p) { \
  +         return rcsid(p = id); \
  + }
  ++#else
  ++#define FILE_RCSID(id) \
  ++static const char *rcsid(const char *p) { \
  ++        return rcsid(p = id); \
  ++}
  + #endif
  + 
  + #endif      /* H_SYSTEM */
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to