← Back to branch summary

~peter-pearse/ubuntu/natty/guile-1.8/prop001

« back to all changes in this revision

Viewing changes to debian/patches/guile-1.8-gcc43.diff

  • Committer: Bazaar Package Importer
  • Author(s): Rob Browning
  • Date: 2008-05-10 12:18:50 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080510121850-mwi7tobbfkat03vr
Tags: 1.8.5+1-1
http://bugs.debian.org/462384
http://bugs.debian.org/466778
* Incorporate new upstream stable release.

* Fix gcc 4.3 compilation problems (fixed upstream now).  Thanks to
  Alexander Schmehl <tolimar@debian.org> for the previous, related
  1.8.4+1-2.1 NMU, and to Maximiliano Curia and Daniel Schepler for the
  original patch. (closes: #462384, #466778)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/guile-1.8-gcc43.diff
1
 
diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.c guile-1.8-1.8.3+1/libguile/c-tokenize.c
2
 
--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.c 2007-06-13 22:00:56.000000000 +0000
3
 
+++ guile-1.8-1.8.3+1/libguile/c-tokenize.c     2008-02-23 01:40:11.000000000 +0000
4
 
@@ -579,6 +579,8 @@
5
 
 #include <stdlib.h>
6
 
 #include <string.h>
7
 
   
8
 
+#define YY_NO_INPUT
9
 
+
10
 
 int yylex(void);
11
 
 
12
 
 int yyget_lineno (void);
13
 
diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex guile-1.8-1.8.3+1/libguile/c-tokenize.lex
14
 
--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex       2007-05-09 20:22:03.000000000 +0000
15
 
+++ guile-1.8-1.8.3+1/libguile/c-tokenize.lex   2008-02-23 01:39:42.000000000 +0000
16
 
@@ -18,7 +18,9 @@
17
 
 #include <stdio.h>
18
 
 #include <stdlib.h>
19
 
 #include <string.h>
20
 
-  
21
 
+ 
22
 
+#define YY_NO_INPUT
23
 
+ 
24
 
 int yylex(void);
25
 
 
26
 
 int yyget_lineno (void);
27
 
diff -urN guile-1.8-1.8.3+1.old/libguile/inline.h guile-1.8-1.8.3+1/libguile/inline.h
28
 
--- guile-1.8-1.8.3+1.old/libguile/inline.h     2007-05-09 20:22:03.000000000 +0000
29
 
+++ guile-1.8-1.8.3+1/libguile/inline.h 2008-02-23 01:43:22.000000000 +0000
30
 
@@ -55,6 +55,12 @@
31
 
 extern unsigned scm_newcell2_count;
32
 
 extern unsigned scm_newcell_count;
33
 
 
34
 
+#ifdef __GNUC_STDC_INLINE__
35
 
+#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
36
 
+#else
37
 
+#define SCM_C_GNU_INLINE SCM_C_INLINE
38
 
+#endif
39
 
+
40
 
 #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
41
 
 /* definitely inlining */
42
 
 #ifdef __GNUC__
43
 
@@ -62,7 +68,7 @@
44
 
 #else
45
 
 static
46
 
 #endif
47
 
-SCM_C_INLINE
48
 
+SCM_C_GNU_INLINE
49
 
 #endif
50
 
 SCM
51
 
 scm_cell (scm_t_bits car, scm_t_bits cdr)
52
 
@@ -138,7 +144,7 @@
53
 
 #else
54
 
 static
55
 
 #endif
56
 
-SCM_C_INLINE
57
 
+SCM_C_GNU_INLINE
58
 
 #endif
59
 
 SCM
60
 
 scm_double_cell (scm_t_bits car, scm_t_bits cbr,
61
 
@@ -213,7 +219,7 @@
62
 
 #else
63
 
 static
64
 
 #endif
65
 
-SCM_C_INLINE
66
 
+SCM_C_GNU_INLINE
67
 
 #endif
68
 
 SCM
69
 
 scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
70
 
@@ -228,7 +234,7 @@
71
 
 #else
72
 
 static
73
 
 #endif
74
 
-SCM_C_INLINE
75
 
+SCM_C_GNU_INLINE
76
 
 #endif
77
 
 void
78
 
 scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
79
 
@@ -243,7 +249,7 @@
80
 
 #else
81
 
 static
82
 
 #endif
83
 
-SCM_C_INLINE
84
 
+SCM_C_GNU_INLINE
85
 
 #endif
86
 
 int
87
 
 scm_is_pair (SCM x)