From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 8 Aug 2007 21:58:58 -0000 Subject: [Cluster-devel] conga/ricci/modules/storage FSController.cpp Message-ID: <20070808215858.23200.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: rmccabe at sourceware.org 2007-08-08 21:58:58 Modified files: ricci/modules/storage: FSController.cpp Log message: brew still has an old version of libgroup.h Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.3&r2=1.7.2.4 --- conga/ricci/modules/storage/FSController.cpp 2007/08/08 21:09:44 1.7.2.3 +++ conga/ricci/modules/storage/FSController.cpp 2007/08/08 21:58:58 1.7.2.4 @@ -28,7 +28,10 @@ #include "UnsupportedFS.h" #include "utils.h" #include + +#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN #include +#endif using namespace std; @@ -36,6 +39,7 @@ FSController::get_fs_group_ids(const String& name) { list members; +#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN group_data_t fsgroup; if (group_get_group(2, name.c_str(), &fsgroup) != 0) @@ -51,6 +55,7 @@ throw String("invalid node id"); members.push_back(String(buf)); } +#endif return members; }