diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-02-24 17:51:05 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-02-24 17:51:05 +0000 |
| commit | e49877a0bf1c30e04d268711694ac522ff41d82a (patch) | |
| tree | cfe6103c74348f46fc316997dae93ebe3aeac229 | |
| parent | 8d4f2913baa1cb7f96616a388895b8368089845d (diff) | |
| download | libusb-e49877a0bf1c30e04d268711694ac522ff41d82a.tar.gz | |
moved standard calls redefinitions into a separate .h
This applies to read/write/close/poll/pipe -> unistd_posix.h
| -rw-r--r-- | libusb/Makefile.am | 6 | ||||
| -rw-r--r-- | libusb/core.c | 8 | ||||
| -rw-r--r-- | libusb/io.c | 8 |
3 files changed, 5 insertions, 17 deletions
diff --git a/libusb/Makefile.am b/libusb/Makefile.am index dc7ac45..e8de9f5 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -6,9 +6,9 @@ else THREADS_SRC = os/threads_windows.h os/threads_windows.c endif -LINUX_USBFS_SRC = $(THREADS_SRC) os/linux_usbfs.h os/linux_usbfs.c -DARWIN_USB_SRC = $(THREADS_SRC) os/darwin_usb.h os/darwin_usb.c -WINDOWS_USB_SRC = $(THREADS_SRC) os/windows_usb.h os/windows_usb.c os/windows_compat.h os/windows_compat.c +LINUX_USBFS_SRC = $(THREADS_SRC) os/unistd_posix.h os/linux_usbfs.h os/linux_usbfs.c +DARWIN_USB_SRC = $(THREADS_SRC) os/unistd_posix.h os/darwin_usb.h os/darwin_usb.c +WINDOWS_USB_SRC = $(THREADS_SRC) os/windows_compat.h os/windows_compat.c os/windows_usb.h os/windows_usb.c EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(WINDOWS_USB_SRC) diff --git a/libusb/core.c b/libusb/core.c index de16ea2..10e7f49 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -26,13 +26,7 @@ #include <string.h> #include <sys/types.h> #ifndef OS_WINDOWS -#include <unistd.h> -#include <poll.h> -#define _libusb_write write -#define _libusb_read read -#define _libusb_close close -#define _libusb_pipe pipe -#define _libusb_poll poll +#include "os/unistd_posix.h" #endif #include "libusb.h" diff --git a/libusb/io.c b/libusb/io.c index 198c48b..2d6afa5 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -29,13 +29,7 @@ #endif #include <time.h> #ifndef OS_WINDOWS -#include <unistd.h> -#include <poll.h> -#define _libusb_write write -#define _libusb_read read -#define _libusb_close close -#define _libusb_pipe pipe -#define _libusb_poll poll +#include "os/unistd_posix.h" #endif #ifdef USBI_TIMERFD_AVAILABLE |