OpenBSD: move AFS memory type offet

The internal malloc memory types for IPv6 (M_IP6OPT, ...) conflict
with the type numbers used to designate AFS memory (M_AFSFID, etc.).
This change moves the AFS memory type to a new number that does not
conflict. This is not a serious issue but can create real confusion
when trying to debug or track memory issues, among other things.

Change-Id: Icccaa7c06443cab008013414cb3c2ab4ea08889e
Reviewed-on: http://gerrit.openafs.org/1271
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 03ac7bd100d93f2f47b5e3724c61e3d93a9eca56)
Change-Id: I518850e0a4ac4e527f5cedba6cdc83daeafb6ddd
Reviewed-on: http://gerrit.openafs.org/1258

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 29a8339e936b295ed2dc1cc854d517dfa11f7909..229e27f82ec93863e44b1599d14257d7addaea6d 100644 (file)
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -23,10 +23,15 @@
 
 #include <sys/lock.h>
 
+#if defined(M_IP6OPT)
+#define M_AFSFID       (M_IP6OPT-1)
+#else
 #define M_AFSFID       (M_TEMP-1)
-#define M_AFSBUFHDR    (M_TEMP-2)
-#define M_AFSBUFFER    (M_TEMP-3)
-#define M_AFSGENERIC   (M_TEMP-4)
+#endif
+
+#define M_AFSBUFHDR    (M_AFSFID-1)
+#define M_AFSBUFFER    (M_AFSFID-2)
+#define M_AFSGENERIC   (M_AFSFID-3)
 
 /* vfs */
 #define osi_vfs                mount