1.1 --- a/src/os/linux/vm/jvm_linux.h Mon Dec 19 21:38:51 2011 -0800
1.2 +++ b/src/os/linux/vm/jvm_linux.h Wed Dec 21 15:48:16 2011 -0500
1.3 @@ -33,7 +33,6 @@
1.4 // All local includes have been commented out.
1.5 */
1.6
1.7 -
1.8 #ifndef JVM_MD_H
1.9 #define JVM_MD_H
1.10
1.11 @@ -44,6 +43,7 @@
1.12
1.13 #include <dirent.h> /* For DIR */
1.14 #include <sys/param.h> /* For MAXPATHLEN */
1.15 +#include <sys/socket.h> /* For socklen_t */
1.16 #include <unistd.h> /* For F_OK, R_OK, W_OK */
1.17
1.18 #define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
1.19 @@ -95,8 +95,4 @@
1.20
1.21 #endif /* JVM_MD_H */
1.22
1.23 -// Reconciliation History
1.24 -// jvm_solaris.h 1.6 99/06/22 16:38:47
1.25 -// End
1.26 -
1.27 #endif // OS_LINUX_VM_JVM_LINUX_H
