From c85b32434962a2999f9e6872bba4d24433e13577 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Mon, 24 May 2010 17:32:39 +0200
Subject: libusbmuxd: rename FD_* enum values to FDM_* to prevent conflicts
This seems to be a win32 issue only. But this rename doesn't hurt!
---
libusbmuxd/sock_stuff.c | 8 ++++----
libusbmuxd/sock_stuff.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'libusbmuxd')
diff --git a/libusbmuxd/sock_stuff.c b/libusbmuxd/sock_stuff.c
index 487afda..141dd1a 100644
--- a/libusbmuxd/sock_stuff.c
+++ b/libusbmuxd/sock_stuff.c
@@ -254,13 +254,13 @@ int check_fd(int fd, fd_mode fdm, unsigned int timeout)
do {
eagain = 0;
switch (fdm) {
- case FD_READ:
+ case FDM_READ:
sret = select(fd + 1, &fds, NULL, NULL, pto);
break;
- case FD_WRITE:
+ case FDM_WRITE:
sret = select(fd + 1, NULL, &fds, NULL, pto);
break;
- case FD_EXCEPT:
+ case FDM_EXCEPT:
sret = select(fd + 1, NULL, NULL, &fds, pto);
break;
default:
@@ -308,7 +308,7 @@ int recv_buf_timeout(int fd, void *data, size_t length, int flags,
int result;
// check if data is available
- res = check_fd(fd, FD_READ, timeout);
+ res = check_fd(fd, FDM_READ, timeout);
if (res <= 0) {
return res;
}
diff --git a/libusbmuxd/sock_stuff.h b/libusbmuxd/sock_stuff.h
index 282da68..eb53359 100644
--- a/libusbmuxd/sock_stuff.h
+++ b/libusbmuxd/sock_stuff.h
@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdint.h>
enum fd_mode {
- FD_READ,
- FD_WRITE,
- FD_EXCEPT
+ FDM_READ,
+ FDM_WRITE,
+ FDM_EXCEPT
};
typedef enum fd_mode fd_mode;
--
cgit v1.1-32-gdbae