diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:12:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:12:54 -0800 |
commit | cd17abdf75207e01bb716c2c7c9f62e56f2f0fdb (patch) | |
tree | 8ddefeb14a63c61cc146c262fc0f9e36e73d4b79 /compat | |
parent | 5d6c53bb230b20b4bec8fb462df0031a14f4c995 (diff) | |
parent | 439fbb807259ad52f1af86ca5e5c98b5f189a246 (diff) | |
download | git-cd17abdf75207e01bb716c2c7c9f62e56f2f0fdb.tar.gz |
Merge branch 'vr/msvc'
* vr/msvc:
MSVC: Remove unneeded header stubs
Compile fix for MSVC: Include <io.h>
Compile fix for MSVC: Do not include sys/resources.h
Diffstat (limited to 'compat')
-rw-r--r-- | compat/msvc.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/arpa/inet.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/grp.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/inttypes.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/netdb.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/netinet/in.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/netinet/tcp.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/pwd.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/sys/ioctl.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/sys/select.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/sys/socket.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/sys/wait.h | 1 | ||||
-rw-r--r-- | compat/vcbuild/include/termios.h | 1 |
13 files changed, 1 insertions, 12 deletions
diff --git a/compat/msvc.h b/compat/msvc.h index a33b01c032..aa4b56315a 100644 --- a/compat/msvc.h +++ b/compat/msvc.h @@ -4,6 +4,7 @@ #include <direct.h> #include <process.h> #include <malloc.h> +#include <io.h> /* porting function */ #define inline __inline diff --git a/compat/vcbuild/include/arpa/inet.h b/compat/vcbuild/include/arpa/inet.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/arpa/inet.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/grp.h b/compat/vcbuild/include/grp.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/grp.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/inttypes.h b/compat/vcbuild/include/inttypes.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/inttypes.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/netdb.h b/compat/vcbuild/include/netdb.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/netdb.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/netinet/in.h b/compat/vcbuild/include/netinet/in.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/netinet/in.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/netinet/tcp.h b/compat/vcbuild/include/netinet/tcp.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/netinet/tcp.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/pwd.h b/compat/vcbuild/include/pwd.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/pwd.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/sys/ioctl.h b/compat/vcbuild/include/sys/ioctl.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/sys/select.h b/compat/vcbuild/include/sys/select.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/select.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/sys/socket.h b/compat/vcbuild/include/sys/socket.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/socket.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/sys/wait.h b/compat/vcbuild/include/sys/wait.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/wait.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/termios.h b/compat/vcbuild/include/termios.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/termios.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ |