Преглед изворни кода

fix building under FreeBSD/amd64 where inline causes trouble

Ralf S. Engelschall пре 19 година
родитељ
комит
c3007624dd
2 измењених фајлова са 25 додато и 4 уклоњено
  1. 24 3
      cpio/cpio.patch
  2. 1 1
      cpio/cpio.spec

+ 24 - 3
cpio/cpio.patch

@@ -1,6 +1,27 @@
+Index: lib/argp-help.c
+--- lib/argp-help.c.orig	2006-09-12 10:59:04 +0200
++++ lib/argp-help.c	2006-10-24 13:29:40 +0200
+@@ -567,7 +567,7 @@
+   return val;
+ }
+ 
+-static inline int
++static int
+ __attribute__ ((always_inline))
+ hol_entry_long_iterate (const struct hol_entry *entry,
+ 			int (*func)(const struct argp_option *opt,
+@@ -592,7 +592,7 @@
+ }
+ 
+ /* Iterator that returns true for the first short option.  */
+-static inline int
++static int
+ until_short (const struct argp_option *opt, const struct argp_option *real,
+ 	     const char *domain, void *cookie)
+ {
 Index: lib/rtapelib.c
 --- lib/rtapelib.c.orig	2006-02-20 10:46:01 +0100
-+++ lib/rtapelib.c	2006-10-22 11:09:19 +0200
++++ lib/rtapelib.c	2006-10-24 13:18:23 +0200
 @@ -625,7 +625,7 @@
  {
    char command_buffer[COMMAND_BUFFER_SIZE];
@@ -25,7 +46,7 @@ Index: lib/rtapelib.c
          *--p = 0;
 Index: lib/system.h
 --- lib/system.h.orig	2006-09-08 18:57:52 +0200
-+++ lib/system.h	2006-10-22 11:09:58 +0200
++++ lib/system.h	2006-10-24 13:18:23 +0200
 @@ -425,7 +425,7 @@
  
  #include <intprops.h>
@@ -37,7 +58,7 @@ Index: lib/system.h
  
 Index: src/userspec.c
 --- src/userspec.c.orig	2005-05-19 11:25:58 +0200
-+++ src/userspec.c	2006-10-22 11:09:19 +0200
++++ src/userspec.c	2006-10-24 13:18:23 +0200
 @@ -22,6 +22,7 @@
  #include <system.h>
  

+ 1 - 1
cpio/cpio.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        Archiver
 License:      GPL
 Version:      2.7
-Release:      20061022
+Release:      20061024
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz