[PATCH] Make 'ARCH' a define, it may not be used

diff --git a/arch-alpha.h b/arch-alpha.h
index be06047b7ccba2ea66933aa6c1b7cf73f3abf1d1..b1b1e8abbbc2e0ce1e3dd879d97ae5e792fb1f02 100644 (file)
--- a/arch-alpha.h
+++ b/arch-alpha.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_ALPHA_H
 #define ARCH_ALPHA_H
 
-static int arch = arch_alpha;
+#define ARCH   (arch_alpha)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                442

diff --git a/arch-ia64.h b/arch-ia64.h
index 5b55e8ac8c994515c3da9f9a23a1b3ebf01b82b8..c9c050853722c25577cedc84448a2b8c10559f29 100644 (file)
--- a/arch-ia64.h
+++ b/arch-ia64.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_IA64_H
 #define ARCH_IA64_H
 
-static int arch = arch_ia64;
+#define ARCH   (arch_ia64)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                1274

diff --git a/arch-ppc.h b/arch-ppc.h
index 8469657b162cf8cf043a444844533f6a128a9a8f..e16f99babdf4ea13c9094c483c223d71dad11b50 100644 (file)
--- a/arch-ppc.h
+++ b/arch-ppc.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_PPC_H
 #define ARCH_PPH_H
 
-static int arch = arch_ppc;
+#define ARCH   (arch_ppc)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                273

diff --git a/arch-s390.h b/arch-s390.h
index 81f03771b39c70ccb80d759e34ca316395730ab1..956dccf32a5c617943fa6b170dc4d8a449fb8d4a 100644 (file)
--- a/arch-s390.h
+++ b/arch-s390.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_S390_H
 #define ARCH_S390_H
 
-static int arch = arch_s390;
+#define ARCH   (arch_s390)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                282

diff --git a/arch-x86.h b/arch-x86.h
index 502e9ce66bbe51248bf76af81ba5cfbf3b5d63c9..4e74c0c3a4b4fce97d56da4068bee31750d552c7 100644 (file)
--- a/arch-x86.h
+++ b/arch-x86.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-static int arch = arch_i386;
+#define ARCH   (arch_i386)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                289

diff --git a/arch-x86_64.h b/arch-x86_64.h
index c8350ab50b71974f31376025a7fe689cf3bd2d2d..cca66f681789c3a79aa0d0f44f23c6afd793a009 100644 (file)
--- a/arch-x86_64.h
+++ b/arch-x86_64.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_X86_64_h
 #define ARCH_X86_64_h
 
-static int arch = arch_x86_64;
+#define ARCH   (arch_x86_64)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                251

diff --git a/drivescan.c b/drivescan.c
index e4299edf7eaa67ea227876ed7832028199fc7457..f346ae008a1d4803150e794d207d52b901c30b5d 100644 (file)
--- a/drivescan.c
+++ b/drivescan.c
@@ -149,7 +149,7 @@ int load_progress_state(void)
                printf("Unsupported file version (%d)\n", (int) state.version);
                return 1;
        }
-       if (state.arch != arch) {
+       if (state.arch != ARCH) {
                printf("State file from different arch\n");
                return 1;
        }
@@ -201,7 +201,7 @@ void save_progress_state(void)
 
        memset(&state, 0, sizeof(state));
        state.magic = DRIVESCAN_MAGIC;
-       state.arch = arch;
+       state.arch = ARCH;
        state.version = DRIVESCAN_VERSION;
        state.bs = block_size;
        state.blocks = dev_size;