From 35d428fd029a54207b1cee6d46ab29310385e0fd Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 2 Mar 2010 15:57:46 +0000 Subject: renamed unistd_posix.h to poll_posix.h --- libusb/Makefile.am | 4 ++-- libusb/core.c | 2 +- libusb/io.c | 2 +- libusb/os/poll_posix.h | 12 ++++++++++++ libusb/os/unistd_posix.h | 12 ------------ 5 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 libusb/os/poll_posix.h delete mode 100644 libusb/os/unistd_posix.h diff --git a/libusb/Makefile.am b/libusb/Makefile.am index e8de9f5..1ec8829 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -6,8 +6,8 @@ else THREADS_SRC = os/threads_windows.h os/threads_windows.c endif -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 +LINUX_USBFS_SRC = $(THREADS_SRC) os/poll_posix.h os/linux_usbfs.h os/linux_usbfs.c +DARWIN_USB_SRC = $(THREADS_SRC) os/poll_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 ed41c82..7be7f11 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -25,7 +25,7 @@ #include #include #ifndef OS_WINDOWS -#include "os/unistd_posix.h" +#include "os/poll_posix.h" #endif #include "libusbi.h" diff --git a/libusb/io.c b/libusb/io.c index 48122b5..a7728e0 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -25,7 +25,7 @@ #include #ifndef OS_WINDOWS -#include "os/unistd_posix.h" +#include "os/poll_posix.h" #endif #ifdef USBI_TIMERFD_AVAILABLE diff --git a/libusb/os/poll_posix.h b/libusb/os/poll_posix.h new file mode 100644 index 0000000..0e9981d --- /dev/null +++ b/libusb/os/poll_posix.h @@ -0,0 +1,12 @@ +#ifndef __LIBUSB_UNISTD_POSIX_H__ +#define __LIBUSB_UNISTD_POSIX_H__ + +#include +#include +#define usbi_write write +#define usbi_read read +#define usbi_close close +#define usbi_pipe pipe +#define usbi_poll poll + +#endif /* __LIBUSB_UNISTD_POSIX_H__ */ diff --git a/libusb/os/unistd_posix.h b/libusb/os/unistd_posix.h deleted file mode 100644 index 0e9981d..0000000 --- a/libusb/os/unistd_posix.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __LIBUSB_UNISTD_POSIX_H__ -#define __LIBUSB_UNISTD_POSIX_H__ - -#include -#include -#define usbi_write write -#define usbi_read read -#define usbi_close close -#define usbi_pipe pipe -#define usbi_poll poll - -#endif /* __LIBUSB_UNISTD_POSIX_H__ */ -- cgit v1.2.1