From 102690648db583e83b729bab19fafa943e4468af Mon Sep 17 00:00:00 2001
From: Lincoln Myers <lincoln_myers@yahoo.com>
Date: Mon, 20 Feb 2012 11:21:00 +0800
Subject: [PATCH] Fix compilation on MacOS X
* src/util/virfile.h: the virFileWrapperFdFlags being defined as
a globa variable instead of a type ended up generating a duplicate
symbol error.
* AUTHORS: added Lincoln Myers
---
AUTHORS | 1 +
src/util/virfile.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 7a1fb63309..7c2a6c4aac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -220,6 +220,7 @@ Patches have also been contributed by:
Ansis Atteka <aatteka@nicira.com>
Dan Wendlandt <dan@nicira.com>
Kyle Mestery <kmestery@cisco.com>
+ Lincoln Myers <lincoln_myers@yahoo.com>
[....send patches to get your name here....]
diff --git a/src/util/virfile.h b/src/util/virfile.h
index ec1e90bf65..184677c597 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -58,10 +58,10 @@ typedef virFileWrapperFd *virFileWrapperFdPtr;
int virFileDirectFdFlag(void);
-enum {
+enum virFileWrapperFdFlags {
VIR_FILE_WRAPPER_BYPASS_CACHE = (1 << 0),
VIR_FILE_WRAPPER_NON_BLOCKING = (1 << 1),
-} virFileWrapperFdFlags;
+};
virFileWrapperFdPtr virFileWrapperFdNew(int *fd,
const char *name,