From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 21 Mar 2005 17:14:27 +0000 (+0000)
Subject: * include/am_defs.h: undefine "GROUP" so Solaris 10 with gcc-2.96
X-Git-Tag: am-utils-6_1_rc2~26
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=9ef44dfbf0ba1daac8a0a6044195607edc506f94;p=am-utils-6.1.git

* include/am_defs.h: undefine "GROUP" so Solaris 10 with gcc-2.96
won't complain about a conflict for this definition between
<rpcsvc/nis.h> and <sys/acl.h>.
---

diff --git a/ChangeLog b/ChangeLog
index 5d59f90..251f32c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-21  Erez Zadok  <ezk@cs.sunysb.edu>
+
+	* include/am_defs.h: undefine "GROUP" so Solaris 10 with gcc-2.96
+	won't complain about a conflict for this definition between
+	<rpcsvc/nis.h> and <sys/acl.h>.
+
 2005-03-20  Erez Zadok  <ezk@cs.sunysb.edu>
 
 	* amd/readdir.c (amfs_readdir_browsable): use %p, not %lx.
diff --git a/include/am_defs.h b/include/am_defs.h
index e84a2cc..187348b 100644
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: am_defs.h,v 1.52 2005/01/13 21:24:12 ezk Exp $
+ * $Id: am_defs.h,v 1.53 2005/03/21 17:14:27 ezk Exp $
  *
  */
 
@@ -1003,6 +1003,7 @@ struct sockaddr_dl;
  * in many other header files.  <rpcsvc/nis.h> uses GROUP_OBJ inside enum
  * zotypes.  So if you're unlucky enough to include both headers, you get a
  * compile error because the two symbols conflict.
+ * A similar conflict arises with gcc-2.96 and the definition of "GROUP".
  *
  * Temp hack: undefine acl.h's GROUP_OBJ because it's not needed for
  * am-utils.
@@ -1010,6 +1011,9 @@ struct sockaddr_dl;
 # ifdef GROUP_OBJ
 #  undef GROUP_OBJ
 # endif /* GROUP_OBJ */
+# ifdef GROUP
+#  undef GROUP
+# endif /* GROUP */
 # include <rpcsvc/nis.h>
 #endif /* HAVE_RPCSVC_NIS_H */