Cygwin port patches

[Jerome Marc]

 --- Tom Tromey <tromey@redhat.com> a écrit : > >>>>>
"Jerome" == Jerome Marc <marcjero@yahoo.com>
> writes:
> 
> Jerome> --- natPlainSocketImpl.cc	Mon Apr 15
> 05:21:58 2002
> Jerome> +++ natPlainSocketImpl.cc	Tue Apr 30
> 20:22:25 2002
> Jerome> @@ -46,6 +46,10 @@
> Jerome>  #define ENOPROTOOPT 109
> Jerome>  #endif
> Jerome>  #else /* WIN32 */
> Jerome> +#ifdef HAVE_SYS_IOCTL_H
> Jerome> +#define BSD_COMP
> Jerome> +#include <sys/ioctl.h>
> Jerome> +#endif
> Jerome>  #include <sys/socket.h>
> Jerome>  #include <netinet/in.h>
> Jerome>  #include <netinet/tcp.h>
> 
> I'm checking in a variant of this patch.
> Please send a ChangeLog entry with future patches.
> 
> New patch appended.  I'm  only checking this in on
> the trunk.
> 
> I assume from this patch that the Cygwin port acts
> like a Unix host,
> and libgcj uses the Cygwin libraries.  That seems
> like the logical
> thing; we'll also want to support a cygwin-x-mingw
> port so that people
> can use Cygwin to build native Windows executables.
> 

Yes java binaries are linked to the Cygwin dll.
Your patch is what I wanted to submit first ;-)
I successfully did massive XML parsing today with gcj
+ Cygwin. No problem at all.

Ok for the Changelog...

> Tom
> 
> Index: ChangeLog
> from  Tom Tromey  <tromey@redhat.com>
> 
> 	* java/net/natPlainSocketImpl.cc: Include
> sys/ioctl.h and
> 	sys/filio.h, if present.
> 
> Index: java/net/natPlainSocketImpl.cc
>
===================================================================
> RCS file:
>
/cvs/gcc/gcc/libjava/java/net/natPlainSocketImpl.cc,v
> retrieving revision 1.40
> diff -u -r1.40 natPlainSocketImpl.cc
> --- java/net/natPlainSocketImpl.cc 15 Apr 2002
> 03:21:00 -0000 1.40
> +++ java/net/natPlainSocketImpl.cc 2 May 2002
> 17:31:10 -0000
> @@ -46,11 +46,23 @@
>  #define ENOPROTOOPT 109
>  #endif
>  #else /* WIN32 */
> +
> +#ifdef HAVE_SYS_IOCTL_H
> +#define BSD_COMP /* Get FIONREAD on Solaris2. */
> +#include <sys/ioctl.h>
> +#endif
> +
> +// Pick up FIONREAD on Solaris 2.5.
> +#ifdef HAVE_SYS_FILIO_H
> +#include <sys/filio.h>
> +#endif
> +
>  #include <sys/socket.h>
>  #include <netinet/in.h>
>  #include <netinet/tcp.h>
>  #include <errno.h>
>  #include <string.h>
> +
>  #endif /* WIN32 */
>  #endif /* DISABLE_JAVA_NET */
>   

___________________________________________________________
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com