Define WCOREDUMP in salvsync-server.c

Some platforms do not define WCOREDUMP. Conditionally define WCOREDUMP
in salvsync-server.c, and make all of the similar WCOREDUMP defines in
the tree consistent.

Change-Id: I197979881ade20f6e790bf41523938089379dbe3
Reviewed-on: http://gerrit.openafs.org/846
Reviewed-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Tom Keiser <tkeiser@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index 5e020f3c446dfea9f4a9442e07be6c52e031bfc8..b0ba84a478d11d98b89c996d2792b5c5a108d259 100644 (file)
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -38,9 +38,8 @@
 #include "bnode.h"
 #include "bosprototypes.h"
 
-#if defined(AFS_AIX_ENV) || defined(AFS_SUN4_ENV)
-/* All known versions of AIX lack WCOREDUMP but this works */
-#define WCOREDUMP(x) ((x) & 0x80)
+#ifndef WCOREDUMP
+#define WCOREDUMP(x) ((x) & 0200)
 #endif
 
 #define BNODE_LWP_STACKSIZE    (16 * 1024)

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index 6094f1e278c486d65df6a6dafd16ea0cdae3705c..8ce40f12e189591915fb172ac7555278ea72e037 100644 (file)
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -36,8 +36,8 @@
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
 #endif
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN4_ENV)
-#define WCOREDUMP(x)   (x & 0200)
+#ifndef WCOREDUMP
+#define WCOREDUMP(x)   ((x) & 0200)
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 5a93a5f894fd65a35275f63be6ef697d53f67dc9..68c21467357d7e124a811ee262240043cfdd932f 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -38,8 +38,8 @@
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
 #endif
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN4_ENV)
-#define WCOREDUMP(x)   (x & 0200)
+#ifndef WCOREDUMP
+#define WCOREDUMP(x)   ((x) & 0200)
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>

diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index e9e66a7e18ed00bcce7a4d240393c8fc6cdbe88c..f3cdc23f2b51a9b7353de24934edf55b7f336ba2 100644 (file)
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -69,6 +69,9 @@
 #include <sys/un.h>
 #endif
 
+#ifndef WCOREDUMP
+#define WCOREDUMP(x)    ((x) & 0200)
+#endif
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index e5daf80fb10ca6e98df107f7f781291e7d5cea49..03f6daeb65137cc1d7cdc6eec0aaedc1b7f84597 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -105,8 +105,8 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #include <io.h>
 #include <WINNT/afsevent.h>
 #endif
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN4_ENV)
-#define WCOREDUMP(x)   (x & 0200)
+#ifndef WCOREDUMP
+#define WCOREDUMP(x)   ((x) & 0200)
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>