diff --git a/examples/nfs-fh.c b/examples/nfs-fh.c index b07513b..c7d07bc 100644 --- a/examples/nfs-fh.c +++ b/examples/nfs-fh.c @@ -29,7 +29,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/examples/nfs-io.c b/examples/nfs-io.c index 053eb03..e693ff5 100644 --- a/examples/nfs-io.c +++ b/examples/nfs-io.c @@ -27,7 +27,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #define PRId64 "ll" diff --git a/examples/nfs-ln.c b/examples/nfs-ln.c index fb33809..3fce3e9 100644 --- a/examples/nfs-ln.c +++ b/examples/nfs-ln.c @@ -28,7 +28,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #define PRId64 "ll" diff --git a/examples/nfs4-cat-talloc.c b/examples/nfs4-cat-talloc.c index 02102c1..d7fe5da 100644 --- a/examples/nfs4-cat-talloc.c +++ b/examples/nfs4-cat-talloc.c @@ -45,7 +45,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/examples/nfs4-cat.c b/examples/nfs4-cat.c index 01607f5..b442a61 100644 --- a/examples/nfs4-cat.c +++ b/examples/nfs4-cat.c @@ -45,7 +45,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/examples/nfsclient-async.c b/examples/nfsclient-async.c index 837990f..221df1b 100644 --- a/examples/nfsclient-async.c +++ b/examples/nfsclient-async.c @@ -22,7 +22,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c index e49bd3c..d9e122d 100644 --- a/examples/nfsclient-bcast.c +++ b/examples/nfsclient-bcast.c @@ -22,7 +22,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #endif diff --git a/examples/nfsclient-listservers.c b/examples/nfsclient-listservers.c index 0966be3..149a92e 100644 --- a/examples/nfsclient-listservers.c +++ b/examples/nfsclient-listservers.c @@ -22,7 +22,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #endif diff --git a/examples/nfsclient-raw.c b/examples/nfsclient-raw.c index 0955632..0e01652 100644 --- a/examples/nfsclient-raw.c +++ b/examples/nfsclient-raw.c @@ -23,7 +23,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #endif diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c index 524ea96..797514e 100644 --- a/examples/nfsclient-sync.c +++ b/examples/nfsclient-sync.c @@ -29,7 +29,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #define PRId64 "ll" diff --git a/examples/portmap-client.c b/examples/portmap-client.c index 2948911..bdc49b6 100644 --- a/examples/portmap-client.c +++ b/examples/portmap-client.c @@ -23,7 +23,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #endif diff --git a/examples/portmap-server.c b/examples/portmap-server.c index 3d92b9a..f7b5514 100644 --- a/examples/portmap-server.c +++ b/examples/portmap-server.c @@ -38,7 +38,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/include/Makefile.am b/include/Makefile.am index b411e4c..c367388 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -12,6 +12,6 @@ dist_nfsc_HEADERS = \ ../rquota/libnfs-raw-rquota.h dist_noinst_HEADERS = \ - ../win32/win32_compat.h \ + win32/win32_compat.h \ libnfs-private.h \ slist.h diff --git a/win32/win32_compat.h b/include/win32/win32_compat.h similarity index 100% rename from win32/win32_compat.h rename to include/win32/win32_compat.h diff --git a/lib/init.c b/lib/init.c index 950da03..79e9735 100644 --- a/lib/init.c +++ b/lib/init.c @@ -23,7 +23,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifndef _GNU_SOURCE diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index ba8684c..13413c2 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -27,7 +27,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_SYS_SOCKET_H diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c index a2710f5..c71eb66 100644 --- a/lib/libnfs-zdr.c +++ b/lib/libnfs-zdr.c @@ -26,7 +26,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef AROS diff --git a/lib/libnfs.c b/lib/libnfs.c index 1e70569..c122af5 100755 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -31,7 +31,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_UTIME_H diff --git a/lib/nfs_v3.c b/lib/nfs_v3.c index 9838d37..ed8b929 100644 --- a/lib/nfs_v3.c +++ b/lib/nfs_v3.c @@ -31,7 +31,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_INTTYPES_H diff --git a/lib/nfs_v4.c b/lib/nfs_v4.c index 479e51b..4ca0b4a 100644 --- a/lib/nfs_v4.c +++ b/lib/nfs_v4.c @@ -31,7 +31,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_INTTYPES_H diff --git a/lib/pdu.c b/lib/pdu.c index 3473501..05c48eb 100644 --- a/lib/pdu.c +++ b/lib/pdu.c @@ -24,7 +24,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_NETINET_IN_H diff --git a/lib/socket.c b/lib/socket.c index 2212656..81f062e 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -24,7 +24,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #endif #ifdef HAVE_ARPA_INET_H diff --git a/mount/mount.c b/mount/mount.c index 7d0f615..e025072 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -16,7 +16,7 @@ */ #ifdef WIN32 -#include "win32_compat.h" +#include #endif/*WIN32*/ #include diff --git a/nfs/nfs.c b/nfs/nfs.c index ecefb71..9733f19 100644 --- a/nfs/nfs.c +++ b/nfs/nfs.c @@ -16,7 +16,7 @@ */ #ifdef WIN32 -#include "win32_compat.h" +#include #else #include #endif/*WIN32*/ diff --git a/nfs/nfsacl.c b/nfs/nfsacl.c index 9e41104..81f6c20 100644 --- a/nfs/nfsacl.c +++ b/nfs/nfsacl.c @@ -15,7 +15,7 @@ along with this program; if not, see . */ #ifdef WIN32 -#include "win32_compat.h" +#include #else #include #endif/*WIN32*/ diff --git a/nfs4/nfs4.c b/nfs4/nfs4.c index 17b9fef..dc2cda2 100644 --- a/nfs4/nfs4.c +++ b/nfs4/nfs4.c @@ -17,7 +17,7 @@ */ #ifdef WIN32 -#include "win32_compat.h" +#include #else #include #endif/*WIN32*/ diff --git a/nlm/nlm.c b/nlm/nlm.c index 500a85c..efa34b8 100644 --- a/nlm/nlm.c +++ b/nlm/nlm.c @@ -16,7 +16,7 @@ */ #ifdef WIN32 -#include "win32_compat.h" +#include #endif/*WIN32*/ #include diff --git a/nsm/nsm.c b/nsm/nsm.c index 92760b8..a7e019a 100644 --- a/nsm/nsm.c +++ b/nsm/nsm.c @@ -16,7 +16,7 @@ */ #ifdef WIN32 -#include "win32_compat.h" +#include #endif/*WIN32*/ #include diff --git a/portmap/portmap.c b/portmap/portmap.c index cc2d17d..886c42c 100644 --- a/portmap/portmap.c +++ b/portmap/portmap.c @@ -15,7 +15,7 @@ along with this program; if not, see . */ #ifdef WIN32 -#include "win32_compat.h" +#include #endif/*WIN32*/ #include diff --git a/rquota/rquota.c b/rquota/rquota.c index f7fe27f..ed4813b 100644 --- a/rquota/rquota.c +++ b/rquota/rquota.c @@ -15,7 +15,7 @@ along with this program; if not, see . */ #ifdef WIN32 -#include "win32_compat.h" +#include #endif/*WIN32*/ #include diff --git a/utils/nfs-cat.c b/utils/nfs-cat.c index d568639..b8c7758 100644 --- a/utils/nfs-cat.c +++ b/utils/nfs-cat.c @@ -28,7 +28,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/utils/nfs-cp.c b/utils/nfs-cp.c index 1af4b74..1e9de65 100644 --- a/utils/nfs-cp.c +++ b/utils/nfs-cp.c @@ -28,7 +28,7 @@ #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #else diff --git a/utils/nfs-ls.c b/utils/nfs-ls.c index f74ba2c..7a6560a 100644 --- a/utils/nfs-ls.c +++ b/utils/nfs-ls.c @@ -27,7 +27,7 @@ #endif #ifdef WIN32 -#include "win32_compat.h" +#include #pragma comment(lib, "ws2_32.lib") WSADATA wsaData; #define PRId64 "ll" diff --git a/win32/win32_compat.c b/win32/win32_compat.c index a6876f4..830f9e3 100644 --- a/win32/win32_compat.c +++ b/win32/win32_compat.c @@ -26,7 +26,7 @@ THE SOFTWARE. static int dummy _U_; #else -#include "win32_compat.h" +#include #include #include