From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 1 Apr 2008 21:05:36 +0000 (+0000)
Subject: DEVEL15-vol-osi-assert-20080401
X-Git-Tag: openafs-devel-1_5_35~42
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6a2084b9a371e909bd93dff1622b85272261be25;p=packages%2Fo%2Fopenafs.git

DEVEL15-vol-osi-assert-20080401

LICENSE IPL10

undo the old windows afs assert undoing


(cherry picked from commit 48838bab91b50a5cf8cd3fb7d1902e6b7525bb86)
---

diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c
index 42d275368..11145471a 100644
--- a/src/vol/daemon_com.c
+++ b/src/vol/daemon_com.c
@@ -63,11 +63,6 @@ RCSID
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 
-#ifdef osi_Assert
-#undef osi_Assert
-#endif
-#define osi_Assert(e) (void)(e)
-
 int (*V_BreakVolumeCallbacks) ();
 
 #define MAXHANDLERS	4	/* Up to 4 clients; must be at least 2, so that
diff --git a/src/vol/fssync-client.c b/src/vol/fssync-client.c
index dde5df5bb..777d64010 100644
--- a/src/vol/fssync-client.c
+++ b/src/vol/fssync-client.c
@@ -85,11 +85,6 @@ RCSID
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 
-#ifdef osi_Assert
-#undef osi_Assert
-#endif
-#define osi_Assert(e) (void)(e)
-
 extern int LogLevel;
 
 static SYNC_client_state fssync_state = 
diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 9eb0bfd1b..1d72556bf 100644
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -104,11 +104,6 @@ RCSID
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 
-#ifdef osi_Assert
-#undef osi_Assert
-#endif
-#define osi_Assert(e) (void)(e)
-
 int (*V_BreakVolumeCallbacks) ();
 
 #define MAXHANDLERS	4	/* Up to 4 clients; must be at least 2, so that
diff --git a/src/vol/salvsync-client.c b/src/vol/salvsync-client.c
index ba057efba..1db27faaa 100644
--- a/src/vol/salvsync-client.c
+++ b/src/vol/salvsync-client.c
@@ -53,12 +53,6 @@ RCSID
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 
-#ifdef osi_Assert
-#undef osi_Assert
-#endif
-#define osi_Assert(e) (void)(e)
-
-
 #ifdef AFS_DEMAND_ATTACH_FS
 /*
  * SALVSYNC is a feature specific to the demand attach fileserver
diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index 6de28b879..cfcabf527 100644
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -74,11 +74,6 @@ RCSID
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 
-#ifdef osi_Assert
-#undef osi_Assert
-#endif
-#define osi_Assert(e) (void)(e)
-
 #define MAXHANDLERS	4	/* Up to 4 clients; must be at least 2, so that
 				 * move = dump+restore can run on single server */