Merge remote-tracking branch 'dave/buildsys'

Oh god, what are we thinking thinking merging this. Hopefully this works with
only a few follow-up patches necessary.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index e6747827..e35e35b9 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -87,7 +87,7 @@
 #endif
 
 #define OPEN(fd, path, flags) do { fd = open(path, flags | O_BINARY); } while(fd == -1 && errno == EINTR)
-#define CLOSE(fd) do { int ret; do { ret = close(fd); } while(ret == -1 && errno == EINTR); } while(0)
+#define CLOSE(fd) do { int _ret; do { _ret = close(fd); } while(_ret == -1 && errno == EINTR); } while(0)
 
 /**
  * Used as a buffer/state holder for _alpm_archive_fgets().