From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 15 Oct 2010 20:09:27 +0000 (-0400)
Subject: rename afs/assert.h to afs/afs_assert.h
X-Git-Tag: openafs-devel-1_7_1~1404
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=78502b61b3e8b288ce6fec1f66d14d7e2431642a

rename afs/assert.h to afs/afs_assert.h

provide a private assert header which does not
pollute the normal namespace for the assert header.

further changes will modify pthread operations to not use
generic assert as a "did it work", which breaks if NDEBUG is set

Change-Id: I43a95c0aa31ad2e772bce9142356fd5c5bedac6c
Reviewed-on: http://gerrit.openafs.org/2995
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 0ed4243..a612b29 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1435,7 +1435,7 @@
                             <File Id="fileubik_int_H" Name="ubik_int.h" LongName="ubik_int.h" DiskId="1" src="$(var.IncDir)ubik_int.h" /> 
                         </Component>
                         <Directory Id="dirIncludeAfs" Name="afs">
-                            <Component Id="cmp_SDK_Include_afs" Guid="6F1F245C-BDD9-479A-A6D8-00A8F1AE8F86">
+                            <Component Id="cmp_SDK_Include_afs" Guid="DDAE87DF-AFA8-4EAF-BE9C-6A32D6D4ED06">
                                 <File Id="fileacl_H" Name="acl.h" LongName="acl.h" DiskId="1" src="$(var.IncDir)afs\acl.h" /> 
                                 <File Id="fileafscbint_H" Name="afscbint.h" LongName="afscbint.h" DiskId="1" src="$(var.IncDir)afs\afscbint.h" /> 
                                 <File Id="fileafsconfig_H" Name="AFSCON~1.h" LongName="afsconfig.h" DiskId="1" src="$(var.IncDir)afs\afsconfig.h" /> 
@@ -1468,7 +1468,7 @@
                                 <File Id="fileafs_sysnames_H" Name="AFS_SY~1.h" LongName="afs_sysnames.h" DiskId="1" src="$(var.IncDir)afs\afs_sysnames.h" /> 
                                 <File Id="fileafs_utilAdmin_H" Name="AFS_UT~1.h" LongName="afs_utilAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_utilAdmin.h" /> 
                                 <File Id="fileafs_vosAdmin_H" Name="AFS_VO~1.h" LongName="afs_vosAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_vosAdmin.h" /> 
-                                <File Id="fileassert_H" Name="assert.h" LongName="assert.h" DiskId="1" src="$(var.IncDir)afs\assert.h" /> 
+                                <File Id="fileassert_H" Name="AFS_AS~1.h" LongName="afs_assert.h" DiskId="1" src="$(var.IncDir)afs\afs_assert.h" /> 
                                 <File Id="fileaudit_H" Name="audit.h" LongName="audit.h" DiskId="1" src="$(var.IncDir)afs\audit.h" /> 
                                 <File Id="fileauth_H" Name="auth.h" LongName="auth.h" DiskId="1" src="$(var.IncDir)afs\auth.h" /> 
                                 <File Id="filebnode_H" Name="bnode.h" LongName="bnode.h" DiskId="1" src="$(var.IncDir)afs\bnode.h" /> 
diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 0bd7716..7ee3db3 100644
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -17,7 +17,11 @@
 #include  <stdlib.h>
 #include  <string.h>
 #include  <limits.h>
+#ifdef AFS_PTHREAD_ENV
 #include  <assert.h>
+#else
+#include <afs/afs_assert.h>
+#endif
 #include  <stdarg.h>
 
 #if !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_USR_FBSD_ENV) && !defined(AFS_USR_DFBSD_ENV) /* must be included after KERNEL undef'd */
diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index e399a4e..e632092 100644
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -30,7 +30,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index e447d58..9efcbe8 100644
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <afs/procmgmt.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <sys/stat.h>
 #include <afs/nfs.h>
diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 5ccf654..82b3d04 100644
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <afs/procmgmt.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <fcntl.h>
 #include <afs/nfs.h>
diff --git a/src/lwp/lock.c b/src/lwp/lock.c
index faab0bc..d2897f9 100644
--- a/src/lwp/lock.c
+++ b/src/lwp/lock.c
@@ -26,8 +26,8 @@
 #include <afs/param.h>
 
 
-#ifdef AFS_PTHREAD_ENV
-#include <afs/assert.h>
+#ifndef AFS_PTHREAD_ENV
+#include <afs/afs_assert.h>
 #else /* AFS_PTHREAD_ENV */
 #include <assert.h>
 #endif /* AFS_PTHRED_ENV */
diff --git a/src/lwp/rw.c b/src/lwp/rw.c
index f814fd8..a416515 100644
--- a/src/lwp/rw.c
+++ b/src/lwp/rw.c
@@ -31,7 +31,7 @@ extern char *calloc();
 #include "lwp.h"
 #include "lock.h"
 #include "preempt.h"
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #define DEFAULT_READERS	5
 
diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index 1f2e48b..b7bea96 100644
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -38,7 +38,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/dir.h>
 
 #include <fcntl.h>
diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index e1b38be..7dc526c 100644
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #include <sys/file.h>
 #endif
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <sys/stat.h>
 
 #include <afs/stds.h>
diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c
index 77f39d8..5e80394 100644
--- a/src/tviced/state_analyzer.c
+++ b/src/tviced/state_analyzer.c
@@ -28,7 +28,7 @@
 
 #include <afs/stds.h>
 #include <rx/xdr.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 32e38cc..839c067 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -26,7 +26,7 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
 includes = \
 	${TOP_INCDIR}/afs/dirpath.h \
 	${TOP_INCDIR}/afs/pthread_nosigs.h \
-	${TOP_INCDIR}/afs/assert.h \
+	${TOP_INCDIR}/afs/afs_assert.h \
 	${TOP_INCDIR}/afs/errors.h \
 	${TOP_INCDIR}/afs/vice.h \
 	${TOP_INCDIR}/afs/remote.h \
@@ -62,7 +62,7 @@ ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
 ${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
 	${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
+${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
 	${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
@@ -175,7 +175,7 @@ install: dirpath.h util.a sys
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL_DATA} dirpath.h ${DESTDIR}${includedir}/afs/dirpath.h
 	${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DESTDIR}${includedir}/afs/pthread_nosigs.h
-	${INSTALL_DATA} ${srcdir}/assert.h ${DESTDIR}${includedir}/afs/assert.h
+	${INSTALL_DATA} ${srcdir}/afs_assert.h ${DESTDIR}${includedir}/afs/afs_assert.h
 	${INSTALL_DATA} ${srcdir}/errors.h ${DESTDIR}${includedir}/afs/errors.h
 	${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
 	${INSTALL_DATA} ${srcdir}/remote.h ${DESTDIR}${includedir}/afs/remote.h
@@ -204,7 +204,7 @@ dest: dirpath.h util.a sys
 	${INSTALL} -d ${DEST}/bin
 	${INSTALL_DATA} dirpath.h ${DEST}/include/afs/dirpath.h
 	${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DEST}/include/afs/pthread_nosigs.h
-	${INSTALL_DATA} ${srcdir}/assert.h ${DEST}/include/afs/assert.h
+	${INSTALL_DATA} ${srcdir}/afs_assert.h ${DEST}/include/afs/afs_assert.h
 	${INSTALL_DATA} ${srcdir}/errors.h ${DEST}/include/afs/errors.h
 	${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
 	${INSTALL_DATA} ${srcdir}/remote.h ${DEST}/include/afs/remote.h
diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 8c31d6f..2bd40ae 100644
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -16,7 +16,7 @@ INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 INCFILES =\
 	$(DESTDIR)\include\dirent.h \
 	$(INCFILEDIR)\afsutil.h \
-	$(INCFILEDIR)\assert.h \
+	$(INCFILEDIR)\afs_assert.h \
 	$(INCFILEDIR)\errors.h \
 	$(INCFILEDIR)\itc.h \
 	$(INCFILEDIR)\vice.h \
diff --git a/src/util/assert.h b/src/util/afs_assert.h
similarity index 100%
rename from src/util/assert.h
rename to src/util/afs_assert.h
diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index abb1406..7469b64 100644
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -18,7 +18,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <stdio.h>
-#include "assert.h"
+#include "afs_assert.h"
 #include "afsutil.h"
 #include "fileutil.h"
 #ifdef AFS_PTHREAD_ENV
diff --git a/src/util/netutils.c b/src/util/netutils.c
index 129949d..7dc2ac9 100644
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -42,7 +42,11 @@
 
 #include <rx/rx.h>
 
-#include "assert.h"
+#ifdef AFS_PTHREAD_ENV
+#include <assert.h>
+#else
+#include "afs_assert.h"
+#endif
 #include "afsutil.h"
 #include <afs/dirpath.h>
 
diff --git a/src/util/thread_pool.c b/src/util/thread_pool.c
index 5eed860..070ec01 100644
--- a/src/util/thread_pool.c
+++ b/src/util/thread_pool.c
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/param.h>
diff --git a/src/util/work_queue.c b/src/util/work_queue.c
index d2e1ea1..771b4dc 100644
--- a/src/util/work_queue.c
+++ b/src/util/work_queue.c
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/param.h>
diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 6b01518..0ed08bc 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -64,7 +64,7 @@
 #include <afs/stds.h>
 #include <rx/xdr.h>
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>
diff --git a/src/viced/callback.c b/src/viced/callback.c
index 602d2bb..a9f52a0 100644
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -97,7 +97,7 @@
 #include <sys/file.h>
 #include <unistd.h>
 #endif
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #include <afs/stds.h>
 
diff --git a/src/viced/host.c b/src/viced/host.c
index c0d5718..d9bf407 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -27,7 +27,7 @@
 
 #include <afs/stds.h>
 #include <rx/xdr.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsint.h>
diff --git a/src/viced/physio.c b/src/viced/physio.c
index caf5cf2..b56465d 100644
--- a/src/viced/physio.c
+++ b/src/viced/physio.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #endif
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <lwp.h>
 #include <lock.h>
 #include <time.h>
diff --git a/src/viced/viced.c b/src/viced/viced.c
index 015091d..0e9d2a9 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -55,7 +55,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <lwp.h>
 #include <lock.h>
diff --git a/src/vol/clone.c b/src/vol/clone.c
index c42c8af..e6076b4 100644
--- a/src/vol/clone.c
+++ b/src/vol/clone.c
@@ -24,7 +24,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
diff --git a/src/vol/fssync-client.c b/src/vol/fssync-client.c
index 3ee5206..10c05a0 100644
--- a/src/vol/fssync-client.c
+++ b/src/vol/fssync-client.c
@@ -52,7 +52,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
 #include <string.h>
diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index fb83e48..993e406 100644
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -38,7 +38,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 #include <fcntl.h>
 
diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 4dfbb6f..c08470c 100644
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -64,7 +64,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
 #include <string.h>
diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index 2740e2f..b734a40 100644
--- a/src/vol/ihandle.c
+++ b/src/vol/ihandle.c
@@ -41,7 +41,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #endif /* AFS_PTHREAD_ENV */
 #include <limits.h>
 
diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index e3a1ea6..cbff972 100644
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -102,7 +102,7 @@ ListViceInodes(char *devname, char *mountedOn, FILE *inodeFile,
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #if defined(AFS_HPUX101_ENV)
 #include <unistd.h>
diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 7b505c2..aa5c307 100644
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/param.h>
diff --git a/src/vol/ntops.c b/src/vol/ntops.c
index 0cd94f4..056aeba 100644
--- a/src/vol/ntops.c
+++ b/src/vol/ntops.c
@@ -34,7 +34,7 @@
 #include "volume.h"
 #include "viceinode.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/errmap_nt.h>
 
 #define BASEFILEATTRIBUTE FILE_ATTRIBUTE_NORMAL
diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index 7a89da8..151f0bd 100644
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -17,7 +17,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/vol/partition.c b/src/vol/partition.c
index d3f0a80..3ec83b6 100644
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -130,7 +130,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #if defined(AFS_HPUX_ENV)
diff --git a/src/vol/purge.c b/src/vol/purge.c
index 1ac4bae..5644f09 100644
--- a/src/vol/purge.c
+++ b/src/vol/purge.c
@@ -29,7 +29,7 @@
 #endif
 #include <string.h>
 #include <sys/stat.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/afsutil.h>
 
 #include <rx/xdr.h>
diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index 85ac10b..563222f 100644
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -41,7 +41,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>
diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 4cc0a49..e2708ae 100644
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -43,7 +43,7 @@
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>
diff --git a/src/vol/test/listVicepx.c b/src/vol/test/listVicepx.c
index 0dda161..fe75420 100644
--- a/src/vol/test/listVicepx.c
+++ b/src/vol/test/listVicepx.c
@@ -97,7 +97,7 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"
diff --git a/src/vol/test/nicreate.c b/src/vol/test/nicreate.c
index fb377ed..7863c05 100644
--- a/src/vol/test/nicreate.c
+++ b/src/vol/test/nicreate.c
@@ -33,7 +33,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 char *prog = "nicreate";
diff --git a/src/vol/test/nincdec.c b/src/vol/test/nincdec.c
index c0f82a3..6ad457a 100644
--- a/src/vol/test/nincdec.c
+++ b/src/vol/test/nincdec.c
@@ -33,7 +33,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 char *prog = "nincdec";
diff --git a/src/vol/test/nsubr.c b/src/vol/test/nsubr.c
index d0f9b52..1b21fca 100644
--- a/src/vol/test/nsubr.c
+++ b/src/vol/test/nsubr.c
@@ -29,7 +29,7 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 
 
 
diff --git a/src/vol/test/updateDirInode.c b/src/vol/test/updateDirInode.c
index aeb9870..7bac28e 100644
--- a/src/vol/test/updateDirInode.c
+++ b/src/vol/test/updateDirInode.c
@@ -97,7 +97,7 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"
diff --git a/src/vol/vg_cache.c b/src/vol/vg_cache.c
index e9278ef..ce6376d 100644
--- a/src/vol/vg_cache.c
+++ b/src/vol/vg_cache.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #ifdef AFS_NT40_ENV
 #include <io.h>
diff --git a/src/vol/vg_scan.c b/src/vol/vg_scan.c
index 76dd43f..df87591 100644
--- a/src/vol/vg_scan.c
+++ b/src/vol/vg_scan.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <string.h>
 #ifdef AFS_NT40_ENV
 #include <io.h>
diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index a857af8..086d639 100644
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -27,7 +27,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #include <rx/xdr.h>
diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 1387bf3..ccb1ae5 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -110,7 +110,7 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>
diff --git a/src/vol/volume.c b/src/vol/volume.c
index f440151..77f31d3 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -128,7 +128,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include "afs/assert.h"
+#include "afs/afs_assert.h"
 #endif /* AFS_PTHREAD_ENV */
 #include "vutils.h"
 #ifndef AFS_NT40_ENV
diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index a927e7c..f47b899 100644
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -34,7 +34,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 
 #include <rx/xdr.h>
diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 2b25dc8..2ea2117 100644
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -29,7 +29,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/volser/physio.c b/src/volser/physio.c
index 69e1f91..776d234 100644
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <afs/afsint.h>
 #include <afs/nfs.h>
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #include <afs/dir.h>
 #include <afs/ihandle.h>
 #include "vol.h"
diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index 211ae29..3009129 100644
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -14,7 +14,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index b2f5605..cbe53fa 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -34,7 +34,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index f609e1a..44d7375 100644
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -37,7 +37,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index b350fa3..3fe499d 100644
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -43,7 +43,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
+#include <afs/afs_assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>