- basic 64-bit fixes for bird (sizeof(int)!=sizeof(void*)\!)

Changed files:
    bird-64bit.patch -> 1.1

diff --git a/bird-64bit.patch b/bird-64bit.patch
new file mode 100644 (file)
index 0000000..2ee431e
--- /dev/null
+++ b/bird-64bit.patch
@@ -0,0 +1,80 @@
+diff -dur -x '*~' bird-1.0.11.orig/conf/conf.h bird-1.0.11/conf/conf.h
+--- bird-1.0.11.orig/conf/conf.h       2000-06-04 21:30:13.000000000 +0200
++++ bird-1.0.11/conf/conf.h    2005-07-22 15:30:41.000000000 +0200
+@@ -75,7 +75,7 @@
+   struct symbol *next;
+   struct sym_scope *scope;
+   int class;
+-  int aux;
++  long aux;
+   void *aux2; 
+   void *def;
+   char name[1];
+diff -dur -x '*~' bird-1.0.11.orig/conf/confbase.Y bird-1.0.11/conf/confbase.Y
+--- bird-1.0.11.orig/conf/confbase.Y   2005-02-12 23:27:55.000000000 +0100
++++ bird-1.0.11/conf/confbase.Y        2005-07-22 15:29:02.000000000 +0200
+@@ -25,7 +25,7 @@
+ CF_DECLS
+ 
+ %union {
+-  int i;
++  long i;
+   u32 i32;
+   ip_addr a;
+   struct symbol *s;
+diff -dur -x '*~' bird-1.0.11.orig/filter/config.Y bird-1.0.11/filter/config.Y
+--- bird-1.0.11.orig/filter/config.Y   2004-05-31 19:44:39.000000000 +0200
++++ bird-1.0.11/filter/config.Y        2005-07-22 15:29:16.000000000 +0200
+@@ -97,7 +97,7 @@
+ decls: /* EMPTY */ { $$ = NULL; }
+  | one_decl ';' decls {
+      $$ = $1;
+-     $$->aux = (int) $3;
++     $$->aux = (long) $3;
+    }
+  ;
+ 
+@@ -105,7 +105,7 @@
+ declsn: one_decl { $$ = $1; }
+  | declsn ';' one_decl {
+      $$ = $1;
+-     $$->aux = (int) $3;
++     $$->aux = (long) $3;
+    }
+  ;
+ 
+@@ -168,7 +168,7 @@
+      cf_push_scope($2);
+    } function_params function_body {
+      $2->def = $5;
+-     $2->aux = (int) $4;
++     $2->aux = (long) $4;
+      $2->aux2 = $5;
+      DBG("Hmm, we've got one function here - %s\n", $2->name); 
+      cf_pop_scope();
+diff -dur -x '*~' bird-1.0.11.orig/filter/filter.h bird-1.0.11/filter/filter.h
+--- bird-1.0.11.orig/filter/filter.h   2000-05-30 12:42:39.000000000 +0200
++++ bird-1.0.11/filter/filter.h        2005-07-22 15:30:18.000000000 +0200
+@@ -18,11 +18,11 @@
+   u16 code;
+   u16 aux;
+   union {
+-    int i;
++    long i;
+     void *p;
+   } a1;
+   union {
+-    int i;
++    long i;
+     void *p;
+   } a2;
+   int lineno;
+@@ -44,7 +44,7 @@
+ struct f_val {
+   int type;
+   union {
+-    int i;
++    long i;
+     /*    ip_addr ip; Folded into prefix */   
+     struct f_prefix px;
+     char *s;