SOURCES: reiser4progs-gcc4.patch (NEW) - gcc4 fix from reiserfs-list

[areq]

Author: areq                         Date: Sat Jun 18 15:07:00 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- gcc4 fix from reiserfs-list

---- Files affected:
SOURCES:
   reiser4progs-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/reiser4progs-gcc4.patch
diff -u /dev/null SOURCES/reiser4progs-gcc4.patch:1.1
--- /dev/null	Sat Jun 18 17:07:00 2005
+++ SOURCES/reiser4progs-gcc4.patch	Sat Jun 18 17:06:55 2005
@@ -0,0 +1,99 @@
+===== plugin/key/key_large/key_large.c 1.44 vs edited =====
+--- 1.44/plugin/key/key_large/key_large.c	Mon Jan 17 16:17:03 2005
++++ edited/plugin/key/key_large/key_large.c	Fri May 27 14:24:34 2005
+@@ -6,6 +6,8 @@
+ #ifdef ENABLE_LARGE_KEYS
+ #include "key_large.h"
+ 
++extern reiser4_plug_t key_large_plug;
++
+ /* Returns minimal key */
+ static reiser4_key_t *key_large_minimal(void) {
+ 	return key_common_minimal(&key_large_plug);
+@@ -382,7 +384,7 @@
+ 	.get_name	= key_large_get_name
+ };
+ 
+-static reiser4_plug_t key_large_plug = {
++reiser4_plug_t key_large_plug = {
+ 	.cl    = class_init,
+ 	.id    = {KEY_LARGE_ID, 0, KEY_PLUG_TYPE},
+ #ifndef ENABLE_MINIMAL
+===== plugin/key/key_large/key_large.h 1.14 vs edited =====
+--- 1.14/plugin/key/key_large/key_large.h	Wed Feb  2 01:04:26 2005
++++ edited/plugin/key/key_large/key_large.h	Fri May 27 13:12:59 2005
+@@ -43,8 +43,6 @@
+ 
+ typedef union key_large key_large_t;
+ 
+-extern reiser4_plug_t key_large_plug;
+-
+ typedef enum {
+ 	/* Major locality occupies higher 60 bits of the first element */
+ 	KEY_LARGE_LOCALITY_MASK		= 0xfffffffffffffff0ull,
+===== plugin/key/key_short/key_short.c 1.144 vs edited =====
+--- 1.144/plugin/key/key_short/key_short.c	Mon Jan 17 16:17:03 2005
++++ edited/plugin/key/key_short/key_short.c	Fri May 27 14:25:00 2005
+@@ -6,6 +6,8 @@
+ #ifdef ENABLE_SHORT_KEYS
+ #include "key_short.h"
+ 
++extern reiser4_plug_t key_short_plug;
++
+ /* Returns minimal key */
+ static reiser4_key_t *key_short_minimal(void) {
+ 	return key_common_minimal(&key_short_plug);
+@@ -367,7 +369,7 @@
+ 	.get_name       = key_short_get_name
+ };
+ 
+-static reiser4_plug_t key_short_plug = {
++reiser4_plug_t key_short_plug = {
+ 	.cl    = class_init,
+ 	.id    = {KEY_SHORT_ID, 0, KEY_PLUG_TYPE},
+ #ifndef ENABLE_MINIMAL
+===== plugin/key/key_short/key_short.h 1.48 vs edited =====
+--- 1.48/plugin/key/key_short/key_short.h	Wed Feb  2 01:04:26 2005
++++ edited/plugin/key/key_short/key_short.h	Fri May 27 13:13:12 2005
+@@ -42,8 +42,6 @@
+ 
+ typedef union key_short key_short_t;
+ 
+-extern reiser4_plug_t key_short_plug;
+-
+ typedef enum {
+ 	/* Major locality occupies higher 60 bits of the first element */
+ 	KEY_SHORT_LOCALITY_MASK    = 0xfffffffffffffff0ull,
+===== plugin/oid/oid40/oid40.c 1.99 vs edited =====
+--- 1.99/plugin/oid/oid40/oid40.c	Mon Jan 17 16:17:04 2005
++++ edited/plugin/oid/oid40/oid40.c	Fri May 27 14:24:11 2005
+@@ -8,6 +8,8 @@
+ #include "oid40.h"
+ #include "oid40_repair.h"
+ 
++extern reiser4_plug_t oid40_plug;
++
+ static uint32_t oid40_get_state(generic_entity_t *entity) {
+ 	aal_assert("umka-2088", entity != NULL);
+ 	return ((oid40_t *)entity)->state;
+@@ -201,7 +203,7 @@
+ 	.slink_locality = oid40_slink_locality
+ };
+ 
+-static reiser4_plug_t oid40_plug = {
++reiser4_plug_t oid40_plug = {
+ 	.cl    = class_init,
+ 	.id    = {OID_REISER40_ID, 0, OID_PLUG_TYPE},
+ 	.label = "oid40",
+===== plugin/oid/oid40/oid40.h 1.39 vs edited =====
+--- 1.39/plugin/oid/oid40/oid40.h	Mon Jan 17 16:17:04 2005
++++ edited/plugin/oid/oid40/oid40.h	Fri May 27 14:12:38 2005
+@@ -30,8 +30,6 @@
+ 
+ typedef struct oid40 oid40_t;
+ 
+-extern reiser4_plug_t oid40_plug;
+-
+ #define oid40_get_next(area)            LE64_TO_CPU(*((d64_t *)area))
+ #define oid40_set_next(area, val)       (*((d64_t *)area) = CPU_TO_LE64(val))
+ 
================================================================