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 42d275368126efbf399ef10282621dd144e4f0fd..11145471a550af9d66109e39d8ad87d565a86d58 100644 (file)
--- 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 dde5df5bb25d87f47436f48dc21488b34b5afbf2..777d640106454f9a32ac22dc3b6c3e57104fc435 100644 (file)
--- 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 9eb0bfd1b8037285286e75c6a8b85ca96555fd8b..1d72556bf64d2060c450092b6831b244653119ea 100644 (file)
--- 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 ba057efba0ac1850fe7abafb4c59f48f9647f51f..1db27faaa6e82c5f3f4e745e45153a4ed01fa4fd 100644 (file)
--- 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 6de28b87918107321c39cd7f716ff569784f8b3c..cfcabf527ba177769ff1493e963a1e660a9ce93c 100644 (file)
--- 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 */