[OpenAFS-devel] aklog and com_err, again

Jim Rees rees@umich.edu
Wed, 21 Dec 2005 11:56:51 -0500


I'm sorry, I wasn't paying enough attention to the discussion of aklog and
conflicting versions of com_err.  I now have the same problem on OpenBSD,
and have applied the following "fix."  The resulting aklog builds and runs
fine.  But is there a better way?

Index: aklog_main.c
===================================================================
RCS file: /cvs/openafs/src/aklog/aklog_main.c,v
retrieving revision 1.10
diff -u -r1.10 aklog_main.c
--- aklog_main.c	19 Jul 2005 02:51:26 -0000	1.10
+++ aklog_main.c	21 Dec 2005 16:54:37 -0000
@@ -70,7 +70,9 @@
 
 #else /* !WINDOWS */
 #include <afs/stds.h>
+#ifndef AFS_OBSD_ENV
 #include <afs/com_err.h>
+#endif
 
 #include <afs/param.h>
 #ifdef AFS_SUN5_ENV