comparison src/os/windows/vm/os_windows.cpp @ 4720:4b18532913c7

Merge
author vladidan
date Thu, 22 Dec 2011 12:01:46 -0500
parents e7dead7e90af 11c26bfcf8c7
children 20bfb6d15a94 b16494a69d3d
comparison
equal deleted inserted replaced
4713:129cd462ae89 4720:4b18532913c7
4847 } 4847 }
4848 sock_initialized = TRUE; 4848 sock_initialized = TRUE;
4849 ::mutexUnlock(&sockFnTableMutex); 4849 ::mutexUnlock(&sockFnTableMutex);
4850 } 4850 }
4851 4851
4852 struct hostent* os::get_host_by_name(char* name) { 4852 struct hostent* os::get_host_by_name(char* name) {
4853 if (!sock_initialized) { 4853 if (!sock_initialized) {
4854 initSock(); 4854 initSock();
4855 } 4855 }
4856 if (!os::WinSock2Dll::WinSock2Available()) { 4856 if (!os::WinSock2Dll::WinSock2Available()) {
4857 return NULL; 4857 return NULL;
4878 int os::listen(int fd, int count) { 4878 int os::listen(int fd, int count) {
4879 ShouldNotReachHere(); 4879 ShouldNotReachHere();
4880 return 0; 4880 return 0;
4881 } 4881 }
4882 4882
4883 int os::connect(int fd, struct sockaddr *him, int len) { 4883 int os::connect(int fd, struct sockaddr* him, socklen_t len) {
4884 ShouldNotReachHere(); 4884 ShouldNotReachHere();
4885 return 0; 4885 return 0;
4886 } 4886 }
4887 4887
4888 int os::accept(int fd, struct sockaddr *him, int *len) { 4888 int os::accept(int fd, struct sockaddr* him, socklen_t* len) {
4889 ShouldNotReachHere(); 4889 ShouldNotReachHere();
4890 return 0; 4890 return 0;
4891 } 4891 }
4892 4892
4893 int os::sendto(int fd, char *buf, int len, int flags, 4893 int os::sendto(int fd, char* buf, size_t len, uint flags,
4894 struct sockaddr *to, int tolen) { 4894 struct sockaddr* to, socklen_t tolen) {
4895 ShouldNotReachHere(); 4895 ShouldNotReachHere();
4896 return 0; 4896 return 0;
4897 } 4897 }
4898 4898
4899 int os::recvfrom(int fd, char *buf, int nBytes, int flags, 4899 int os::recvfrom(int fd, char *buf, size_t nBytes, uint flags,
4900 sockaddr *from, int *fromlen) { 4900 sockaddr* from, socklen_t* fromlen) {
4901 ShouldNotReachHere(); 4901 ShouldNotReachHere();
4902 return 0; 4902 return 0;
4903 } 4903 }
4904 4904
4905 int os::recv(int fd, char *buf, int nBytes, int flags) { 4905 int os::recv(int fd, char* buf, size_t nBytes, uint flags) {
4906 ShouldNotReachHere(); 4906 ShouldNotReachHere();
4907 return 0; 4907 return 0;
4908 } 4908 }
4909 4909
4910 int os::send(int fd, char *buf, int nBytes, int flags) { 4910 int os::send(int fd, char* buf, size_t nBytes, uint flags) {
4911 ShouldNotReachHere(); 4911 ShouldNotReachHere();
4912 return 0; 4912 return 0;
4913 } 4913 }
4914 4914
4915 int os::raw_send(int fd, char *buf, int nBytes, int flags) { 4915 int os::raw_send(int fd, char* buf, size_t nBytes, uint flags) {
4916 ShouldNotReachHere(); 4916 ShouldNotReachHere();
4917 return 0; 4917 return 0;
4918 } 4918 }
4919 4919
4920 int os::timeout(int fd, long timeout) { 4920 int os::timeout(int fd, long timeout) {
4930 int os::socket_shutdown(int fd, int howto) { 4930 int os::socket_shutdown(int fd, int howto) {
4931 ShouldNotReachHere(); 4931 ShouldNotReachHere();
4932 return 0; 4932 return 0;
4933 } 4933 }
4934 4934
4935 int os::bind(int fd, struct sockaddr *him, int len) { 4935 int os::bind(int fd, struct sockaddr* him, socklen_t len) {
4936 ShouldNotReachHere(); 4936 ShouldNotReachHere();
4937 return 0; 4937 return 0;
4938 } 4938 }
4939 4939
4940 int os::get_sock_name(int fd, struct sockaddr *him, int *len) { 4940 int os::get_sock_name(int fd, struct sockaddr* him, socklen_t* len) {
4941 ShouldNotReachHere(); 4941 ShouldNotReachHere();
4942 return 0; 4942 return 0;
4943 } 4943 }
4944 4944
4945 int os::get_sock_opt(int fd, int level, int optname, 4945 int os::get_sock_opt(int fd, int level, int optname,
4946 char *optval, int* optlen) { 4946 char* optval, socklen_t* optlen) {
4947 ShouldNotReachHere(); 4947 ShouldNotReachHere();
4948 return 0; 4948 return 0;
4949 } 4949 }
4950 4950
4951 int os::set_sock_opt(int fd, int level, int optname, 4951 int os::set_sock_opt(int fd, int level, int optname,
4952 const char *optval, int optlen) { 4952 const char* optval, socklen_t optlen) {
4953 ShouldNotReachHere(); 4953 ShouldNotReachHere();
4954 return 0; 4954 return 0;
4955 } 4955 }
4956 4956
4957 4957