diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-09 04:55:30 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-09 04:55:30 +0200 |
| commit | d158dde30c378acc8e88d5208aa837f92331af9e (patch) | |
| tree | b99456c7b765becdb5bab3869af5a2e512026562 /lib/libalpm/util.h | |
| parent | 31091963edaa505d00642aecb9950ce087a40b73 (diff) | |
| parent | b729ed01093312cef7ce48d07b13e225b25446db (diff) | |
| download | pacman-d158dde30c378acc8e88d5208aa837f92331af9e.tar.gz pacman-d158dde30c378acc8e88d5208aa837f92331af9e.tar.xz | |
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.
Diffstat (limited to 'lib/libalpm/util.h')
| -rw-r--r-- | lib/libalpm/util.h | 2 |
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(). |