diff -Naurp ORBit-0.5.17/configure ORBit-0.5.17-cygwin/configure
--- ORBit-0.5.17/configure	2002-06-06 12:27:24.000000000 +0100
+++ ORBit-0.5.17-cygwin/configure	2002-06-06 23:00:17.000000000 +0100
@@ -4156,19 +4156,20 @@ EOF
   cygwin* | mingw* | pw32*)
     # hardcode_libdir_flag_spec is actually meaningless, as there is
     # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_libdir_flag_spec='-L$bindir'
     allow_undefined_flag=unsupported
     always_export_symbols=yes
 
-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-      else $CC -o impgen impgen.c ; fi)~
-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+#    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+#      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+#      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+#      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+#      else $CC -o impgen impgen.c ; fi)~
+#      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+extract_expsyms_cmds=true
 
+#    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+old_archive_from_expsyms_cmds=
     # cygwin and mingw dlls have different entry points and sets of symbols
     # to exclude.
     # FIXME: what about values for MSVC?
@@ -6111,10 +6112,12 @@ old_postinstall_cmds=$lt_old_postinstall
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
 # Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+# old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+old_archive_from_new_cmds=
 
 # Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+old_archive_from_expsyms_cmds=
 
 # Commands used to build and install a shared archive.
 archive_cmds=$lt_archive_cmds
diff -Naurp ORBit-0.5.17/libIDL/Makefile.in ORBit-0.5.17-cygwin/libIDL/Makefile.in
--- ORBit-0.5.17/libIDL/Makefile.in	2002-06-06 12:34:42.000000000 +0100
+++ ORBit-0.5.17-cygwin/libIDL/Makefile.in	2002-06-06 23:00:17.000000000 +0100
@@ -159,7 +159,7 @@ tstidl_DEPENDENCIES =  libIDL.la
 tstidl_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(DLL_CFLAGS)
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -232,6 +232,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  if test -f $$p; then \
 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	    echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \
+	    install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \
 	  else :; fi; \
 	done
 
@@ -239,6 +242,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	  rm -f $(DESTDIR)$(bindir)/$$dll; \
 	done
 
 .c.o:
@@ -285,8 +290,10 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
+libIDL.la: DLL_CFLAGS = -DIDL_BUILD_DLL
 libIDL.la: $(libIDL_la_OBJECTS) $(libIDL_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libIDL_la_LDFLAGS) $(libIDL_la_OBJECTS) $(libIDL_la_LIBADD) $(LIBS)
+	cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libIDL_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
diff -Naurp ORBit-0.5.17/libIDL/configure ORBit-0.5.17-cygwin/libIDL/configure
--- ORBit-0.5.17/libIDL/configure	2002-06-06 12:27:28.000000000 +0100
+++ ORBit-0.5.17-cygwin/libIDL/configure	2002-06-06 23:00:17.000000000 +0100
@@ -5155,7 +5155,8 @@ EOF
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+#    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+old_archive_from_expsyms_cmds=
 
     # cygwin and mingw dlls have different entry points and sets of symbols
     # to exclude.
@@ -7102,7 +7103,8 @@ old_postuninstall_cmds=$lt_old_postunins
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
 # Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+old_archive_from_expsyms_cmds=
 
 # Commands used to build and install a shared archive.
 archive_cmds=$lt_archive_cmds
diff -Naurp ORBit-0.5.17/libIDL/lexer.l ORBit-0.5.17-cygwin/libIDL/lexer.l
--- ORBit-0.5.17/libIDL/lexer.l	2002-06-06 12:07:29.000000000 +0100
+++ ORBit-0.5.17-cygwin/libIDL/lexer.l	2002-06-06 23:00:17.000000000 +0100
@@ -201,14 +201,17 @@ dqstring		\"[^\"\n]*[\"\n]
 }
 <*>{whitespace}						;
 {b8_int}						{
+	yylval.integer = 0;
 	sscanf (yytext, "%" IDL_LL "o", &yylval.integer);
 	tokreturn (TOK_INTEGER);
 }
 {b10_uint}						{
+	yylval.integer = 0;
 	sscanf (yytext, "%" IDL_LL "u", &yylval.integer);
 	tokreturn (TOK_INTEGER);
 }
 {b16_int}						{
+	yylval.integer = 0;
 	sscanf (yytext + 2, "%" IDL_LL "x", &yylval.integer);
 	tokreturn (TOK_INTEGER);
 }
diff -Naurp ORBit-0.5.17/mkdll.sh ORBit-0.5.17-cygwin/mkdll.sh
--- ORBit-0.5.17/mkdll.sh	1970-01-01 00:00:00.000000000 +0000
+++ ORBit-0.5.17-cygwin/mkdll.sh	2002-06-06 23:00:17.000000000 +0100
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# script to generate dll from libtool-generated static archive (.la file)
+# invoke in .libs directory with:
+# mkdll.sh <archive.la> <dependency libs>
+# eg:
+# mkdll.sh libtest.la -L/usr/local/lib -llocal
+
+# defaults to using gcc for libraries written in C.
+# set the CC env var to use a different compiler driver: eg
+# export CC=g++ 
+# for C++ libraries
+
+# defaults to using /usr/local as the installation PREFIX
+# override this by setting the PREFIX env var: eg
+# export PREFIX=/opt/gnome
+
+archive=$1
+module=$(echo $(basename $archive) | sed -e 's,^lib\(.*\).la$,\1,')
+
+shift
+dependency_libs="$@"
+
+test -n "$CC" || CC=gcc
+test -n "$PREFIX" || prefix=/usr/local
+
+# get the static library name
+old_lib=$(sed -ne '/^old_library=/ s,^old_library='\''\(.*\)'\''.*$,\1,p' $archive)
+
+# update the archive with the dll and import lib name.
+if sed -e 's,^dlname='\'\'',dlname='\'cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' $archive > ${archive}.tmp
+then cat ${archive}.tmp > ${archive}
+fi
+rm -f ${archive}.tmp
+
+# update the install archive if it exists
+if [ -f ${archive}i ] ; then
+	if sed -e 's,^dlname='\'\'',dlname='\'../bin/cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' ${archive}i > ${archive}i.tmp
+	then cat ${archive}i.tmp > ${archive}i
+	fi
+	rm -f ${archive}i.tmp
+fi
+
+# update the archive with the install dir if not already set
+libdir=${prefix}/lib
+if sed -e '/^libdir=/ s,='\'\'',='\'$libdir\'',' $archive > ${archive}.tmp
+then cat ${archive}.tmp > $archive
+fi
+rm -f ${archive}.tmp
+
+
+# report the link command to stdout
+eval echo $CC -shared -o cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a \
+-Wl,--export-all-symbols -Wl,--whole-archive $old_lib -Wl,--no-whole-archive ${dependency_libs}
+
+# do the link command
+eval $CC -shared -o cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a -Wl,--export-all-symbols \
+-Wl,--whole-archive $old_lib -Wl,--no-whole-archive ${dependency_libs}
+
diff -Naurp ORBit-0.5.17/orbit-config.in ORBit-0.5.17-cygwin/orbit-config.in
--- ORBit-0.5.17/orbit-config.in	2002-06-06 12:07:26.000000000 +0100
+++ ORBit-0.5.17-cygwin/orbit-config.in	2002-06-06 23:00:17.000000000 +0100
@@ -87,7 +87,7 @@ while test $# -gt 0; do
        	;;
 
     client|server)
-	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
+	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@"
         the_flags="$the_flags `glib-config --cflags` "
         test "x$includedir" = "x/usr/include" \
           || the_flags="$the_flags -I$includedir "
diff -Naurp ORBit-0.5.17/popt/configure ORBit-0.5.17-cygwin/popt/configure
--- ORBit-0.5.17/popt/configure	2002-06-06 12:27:41.000000000 +0100
+++ ORBit-0.5.17-cygwin/popt/configure	2002-06-06 23:00:17.000000000 +0100
@@ -5076,7 +5076,8 @@ EOF
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+#    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+old_archive_from_expsyms_cmds=
 
     # cygwin and mingw dlls have different entry points and sets of symbols
     # to exclude.
@@ -7023,7 +7024,8 @@ old_postuninstall_cmds=$lt_old_postunins
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
 # Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+old_archive_from_expsyms_cmds=
 
 # Commands used to build and install a shared archive.
 archive_cmds=$lt_archive_cmds
diff -Naurp ORBit-0.5.17/src/IIOP/Makefile.in ORBit-0.5.17-cygwin/src/IIOP/Makefile.in
--- ORBit-0.5.17/src/IIOP/Makefile.in	2002-06-06 12:34:50.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/IIOP/Makefile.in	2002-06-06 23:00:17.000000000 +0100
@@ -139,7 +139,7 @@ LIBS = @LIBS@
 @HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES = 
 libIIOP_la_OBJECTS =  connection.lo encoders.lo giop-msg-buffer.lo \
 iiop-endian.lo
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(DLL_CFLAGS) -I$(prefix)/include
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -183,6 +183,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  if test -f $$p; then \
 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	    echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \
+	    install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \
 	  else :; fi; \
 	done
 
@@ -190,6 +193,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	  rm -f $(DESTDIR)$(bindir)/$$dll; \
 	done
 
 .c.o:
@@ -236,8 +241,10 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
+libIIOP.la: DLL_CFLAGS = -DIIOP_BUILD_DLL
 libIIOP.la: $(libIIOP_la_OBJECTS) $(libIIOP_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libIIOP_la_LDFLAGS) $(libIIOP_la_OBJECTS) $(libIIOP_la_LIBADD) $(LIBS)
+	cd .libs && PREFIX=$(prefix) sh ../../../mkdll.sh $@ $(LIBS) ../../ORBitutil/.libs/libORBitutil.dll.a $$(glib-config --libs) -lextras
 
 install-libIIOPincludeHEADERS: $(libIIOPinclude_HEADERS)
 	@$(NORMAL_INSTALL)
diff -Naurp ORBit-0.5.17/src/IIOP/connection.c ORBit-0.5.17-cygwin/src/IIOP/connection.c
--- ORBit-0.5.17/src/IIOP/connection.c	2002-06-06 12:07:34.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/IIOP/connection.c	2003-02-19 11:51:02.000000000 +0000
@@ -883,6 +887,10 @@ iiop_connection_new(const char *host, gu
   return retval;
 
 failed:
+#ifdef __CYGWIN__
+  /* needed to work around a bug in Winsock */
+  shutdown(GIOP_CONNECTION_GET_FD(retval), SHUT_RDWR);
+#endif
   close(GIOP_CONNECTION_GET_FD(retval));
   GIOP_CONNECTION(retval)->fd = -1;
   giop_connection_free(GIOP_CONNECTION(retval));
@@ -1047,6 +1055,10 @@ iiop_connection_server_accept(GIOPConnec
       fromhost(&request);
       if(!hosts_access(&request)) {
 	syslog(deny_severity, "[orbit] refused connect from %s", eval_client(&request));
+#ifdef __CYGWIN__
+	/* this is necessary to work around a bug in Winsock */
+	shutdown(newfd, SHUT_RDWR);
+#endif
 	close(newfd); newfd = -1;
       } else
 	syslog(allow_severity, "[orbit] connect from %s", eval_client(&request));
diff -Naurp ORBit-0.5.17/src/Makefile.in ORBit-0.5.17-cygwin/src/Makefile.in
--- ORBit-0.5.17/src/Makefile.in	2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/Makefile.in	2002-06-06 23:00:17.000000000 +0100
@@ -97,7 +97,7 @@ VERSION = @VERSION@
 YACC = @YACC@
 pkglibdir = @pkglibdir@
 
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -Naurp ORBit-0.5.17/src/ORBitutil/Makefile.in ORBit-0.5.17-cygwin/src/ORBitutil/Makefile.in
--- ORBit-0.5.17/src/ORBitutil/Makefile.in	2002-06-06 12:34:49.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/ORBitutil/Makefile.in	2002-06-06 23:00:17.000000000 +0100
@@ -125,7 +125,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libORBitutil_la_LIBADD = 
 libORBitutil_la_OBJECTS =  trace.lo thread-safety.lo compat.lo
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(DLL_CFLAGS)
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -171,6 +171,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  if test -f $$p; then \
 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	    echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \
+	    install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \
 	  else :; fi; \
 	done
 
@@ -178,6 +181,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	  rm -f $(DESTDIR)$(bindir)/$$dll; \
 	done
 
 .c.o:
@@ -224,8 +229,10 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
+libORBitutil.la: DLL_CFLAGS = -DORBITUTIL_BUILD_DLL
 libORBitutil.la: $(libORBitutil_la_OBJECTS) $(libORBitutil_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libORBitutil_la_LDFLAGS) $(libORBitutil_la_OBJECTS) $(libORBitutil_la_LIBADD) $(LIBS)
+	cd .libs && PREFIX=$(prefix) sh ../../../mkdll.sh $@ $(libORBit_la_LIBADD) $(LIBS) $$(glib-config --libs)
 
 install-libORBitutilincludeHEADERS: $(libORBitutilinclude_HEADERS)
 	@$(NORMAL_INSTALL)
diff -Naurp ORBit-0.5.17/src/ORBitutil/os-feature-alloca.h ORBit-0.5.17-cygwin/src/ORBitutil/os-feature-alloca.h
--- ORBit-0.5.17/src/ORBitutil/os-feature-alloca.h	2002-06-06 12:07:35.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/ORBitutil/os-feature-alloca.h	2002-06-06 23:00:17.000000000 +0100
@@ -7,6 +7,7 @@
 
 #  include <string.h>
 
+#ifndef __CYGWIN__
 #  if defined(__GNUC__)
 
 #    if defined(__STRICT_ANSI__) && !defined(alloca)
@@ -22,5 +23,6 @@ char *alloca ();
 #    endif
 
 #  endif /* __GNUC__ etc. */
+#endif
 
 #endif /* OS_FEATURE_ALLOCA_H */
diff -Naurp ORBit-0.5.17/src/ORBitutil/util.h ORBit-0.5.17-cygwin/src/ORBitutil/util.h
--- ORBit-0.5.17/src/ORBitutil/util.h	2002-06-06 12:07:35.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/ORBitutil/util.h	2002-06-06 23:00:17.000000000 +0100
@@ -24,9 +24,26 @@
  *    ~(boundary - 1)
  */
 
+#ifndef __CYGWIN__
 #define ALIGN_ADDRESS(this, boundary) \
   ((gpointer)((( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))))
 
+#else
+	/* Cygwin doubles and long longs have a strange alignment.
+	 * They are a 8-byte intervals, but starting only
+	 * at 0x4 and 0xc (ie displaced by 4).
+	 * So, if the boundary is 8, we need to do extra work.
+	 */
+#define ALIGN_ADDRESS_1(this, boundary) \
+  ((gpointer)((( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))))
+
+#define ALIGN_ADDRESS_2(this) \
+  ((gpointer) (((unsigned long)(ALIGN_ADDRESS_1(this, 4))) % 8 ? ((unsigned long)(ALIGN_ADDRESS_1(this, 4))) : ((unsigned long)(ALIGN_ADDRESS_1(this, 4))) + 4))
+  
+#define ALIGN_ADDRESS(this, boundary) \
+  (boundary == 8 ? ALIGN_ADDRESS_2(this) : ALIGN_ADDRESS_1(this, boundary))
+
+#endif
 
 #include <ORBitutil/thread-safety.h>
 #include <ORBitutil/trace.h>
diff -Naurp ORBit-0.5.17/src/daemons/interface_repository/Makefile.in ORBit-0.5.17-cygwin/src/daemons/interface_repository/Makefile.in
--- ORBit-0.5.17/src/daemons/interface_repository/Makefile.in	2002-06-06 12:34:55.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/daemons/interface_repository/Makefile.in	2002-06-16 16:16:52.000000000 +0100
@@ -106,7 +106,7 @@ orbit_ird_DEPENDENCIES = $(top_builddir)
 
 
 orbit_ird_LDFLAGS = -static
-orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm
+orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@
 
 
 orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c
@@ -230,7 +230,7 @@ maintainer-clean-libtool:
 
 orbit-ird$(EXEEXT): $(orbit_ird_OBJECTS) $(orbit_ird_DEPENDENCIES)
 	@rm -f orbit-ird$(EXEEXT)
-	$(LINK) $(orbit_ird_LDFLAGS) $(orbit_ird_OBJECTS) $(orbit_ird_LDADD) $(LIBS)
+	$(LINK) $(orbit_ird_LDFLAGS) $(orbit_ird_OBJECTS) $(orbit_ird_LDADD) $(LIBS) -lextras
 
 tags: TAGS
 
@@ -431,7 +431,7 @@ maintainer-clean-generic clean mostlycle
 
 
 $(orbit_ird_built): $(IRIDL) $(IDL)
-	$(IDL) --noheaders --nostubs --nocommon $(IRIDL)
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(IDL) --noheaders --nostubs --nocommon $(IRIDL)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff -Naurp ORBit-0.5.17/src/orb/Makefile.in ORBit-0.5.17-cygwin/src/orb/Makefile.in
--- ORBit-0.5.17/src/orb/Makefile.in	2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/orb/Makefile.in	2002-06-16 16:07:40.000000000 +0100
@@ -116,7 +116,7 @@ IDL = $(top_builddir)/src/orbit-idl-comp
 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(GLIB_LIBS)
 
 BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
 
@@ -138,7 +138,7 @@ interface_repository-stubs.lo allocators
 orb.lo orbit.lo poa.lo orbit_poa.lo typecode.lo corba_object.lo \
 orbit_object.lo sequences.lo server.lo orbit_typecode.lo dii.lo \
 dynany.lo ir.lo corba_any.lo corba_context.lo genrand.lo
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(DLL_CFLAGS) -I$(prefix)/include
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -184,6 +184,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  if test -f $$p; then \
 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	    echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \
+	    install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \
 	  else :; fi; \
 	done
 
@@ -191,6 +194,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	  rm -f $(DESTDIR)$(bindir)/$$dll; \
 	done
 
 .c.o:
@@ -237,8 +242,10 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
+libORBit.la: DLL_CFLAGS = -DORBIT_BUILD_DLL
 libORBit.la: $(libORBit_la_OBJECTS) $(libORBit_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libORBit_la_LDFLAGS) $(libORBit_la_OBJECTS) $(libORBit_la_LIBADD) $(LIBS)
+	cd .libs && PREFIX=$(prefix) sh ../../../mkdll.sh $@ $(libORBit_la_LIBADD) $(LIBS) ../../IIOP/.libs/libIIOP.dll.a ../../ORBitutil/.libs/libORBitutil.dll.a $$(glib-config --libs) -lextras
 
 install-libORBitincludeHEADERS: $(libORBitinclude_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -869,7 +876,7 @@ interface_repository-common.c \
 interface_repository-stubs.c: my_ir_stuff
 
 my_ir_stuff: $(IRIDL) $(IDL)
-	$(IDL) --noskels $(IRIDL)
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(IDL) --noskels $(IRIDL)
 	touch my_ir_stuff
 
 $(IDL):
diff -Naurp ORBit-0.5.17/src/orb/dynany.c ORBit-0.5.17-cygwin/src/orb/dynany.c
--- ORBit-0.5.17/src/orb/dynany.c	2002-06-06 12:07:41.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/orb/dynany.c	2002-06-06 23:00:18.000000000 +0100
@@ -452,8 +452,21 @@ dynany_sequence_realloc_to (CORBA_sequen
 	return TRUE;
 }
 
+#ifndef __CYGWIN__
 #define DYNANY_GET_OFFSET(p,i,tc) \
 	((gpointer) (((guchar *) (p)) + ORBit_gather_alloc_info (tc) * (i)))
+#else
+   /* Cygwin 8-byte types are aligned on 8-byte boundaries starting
+    * at 4. So we need to add 4 to the offset for those types if the
+    * address is divisible by 8
+    */
+#define DYNANY_GET_OFFSET_1(p,i,tc) \
+	((gpointer) (((guchar *) (p)) + ORBit_gather_alloc_info (tc) * (i)))
+   
+#define DYNANY_GET_OFFSET(p,i,tc) \
+	((ORBit_find_alignment((tc)) == 8) && (!((unsigned long)(p) % 8)) ? (gpointer) ((unsigned long) DYNANY_GET_OFFSET_1((p),(i),(tc)) + 4) : DYNANY_GET_OFFSET_1((p),(i),(tc)))
+
+#endif
 
 /**
  * dynany_get_value:
diff -Naurp ORBit-0.5.17/src/orb/orb.c ORBit-0.5.17-cygwin/src/orb/orb.c
--- ORBit-0.5.17/src/orb/orb.c	2002-06-06 12:07:42.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/orb/orb.c	2002-06-16 16:06:47.000000000 +0100
@@ -61,6 +61,10 @@
                       + strlen ((ptr)->sun_path))
 #endif
 
+#ifdef __CYGWIN__
+#include <cygextras.h>
+#endif
+
 static void ORBit_ORB_release(CORBA_ORB orb, CORBA_Environment *ev);
 
 static const ORBit_RootObject_Interface CORBA_ORB_epv =
@@ -202,6 +206,9 @@ ORBit_make_local_tmpdir(void)
 				g_error ("Owner of %s is not the current user\n",
 					 tmpstr->str);
 
+#ifdef __CYGWIN__
+         if(check_ntsec(tmpstr->str))
+#endif
 			if((statbuf.st_mode & (S_IRWXG|S_IRWXO))
 			   || !S_ISDIR(statbuf.st_mode))
 				g_error ("Wrong permissions for %s\n",
@@ -264,7 +271,7 @@ ORBit_ORB_make_usock_connection(void)
 	closedir(dirh);
 #endif /* WE_DONT_CARE_ABOUT_STUPID_2DOT0DOTX_KERNELS */
 
-	srand(time(NULL));
+	srand(time(NULL) + getpid());
 	while(!retval) {
 		g_string_sprintf(tmpstr, "/tmp/orbit-%s/orb-%d%d",
 				 g_get_user_name(), rand(), rand());
diff -Naurp ORBit-0.5.17/src/orb/orbit_object.c ORBit-0.5.17-cygwin/src/orb/orbit_object.c
--- ORBit-0.5.17/src/orb/orbit_object.c	2002-06-06 12:07:43.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/orb/orbit_object.c	2002-06-06 23:00:18.000000000 +0100
@@ -167,7 +167,8 @@ CORBA_Object_release_fn(CORBA_Object obj
 	ORBIT_ROOT_OBJECT_UNREF(obj);
 
 	if(ORBIT_ROOT_OBJECT(obj)->refs <= 0) {
-		g_hash_table_remove(obj->orb->objrefs, obj);
+		if(obj->orb)
+			g_hash_table_remove(obj->orb->objrefs, obj);
 		
 		if(obj->connection)
 			giop_connection_unref(obj->connection);
diff -Naurp ORBit-0.5.17/src/orbit-idl-compiler/Makefile.in ORBit-0.5.17-cygwin/src/orbit-idl-compiler/Makefile.in
--- ORBit-0.5.17/src/orbit-idl-compiler/Makefile.in	2002-06-06 12:34:44.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/orbit-idl-compiler/Makefile.in	2002-06-06 23:00:18.000000000 +0100
@@ -64,7 +64,7 @@ AWK = @AWK@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
-EXEEXT = @EXEEXT@
+#EXEEXT = @EXEEXT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
@@ -109,7 +109,7 @@ INCLUDES = -I$(top_builddir) -I$(top_bui
 orbit_idl_DEPENDENCIES = $(top_builddir)/libIDL/libIDL.la 			 backends/c/liborbit-c-backend.a 			 $(top_builddir)/popt/libpopt.la
 
 orbit_idl_LDFLAGS = 
-orbit_idl_LDADD =  	backends/c/liborbit-c-backend.a 	$(top_builddir)/libIDL/libIDL.la 	$(top_builddir)/popt/libpopt.la 	@GLIB_LIBS@ @GMODULE_LIBS@ 	-lm
+orbit_idl_LDADD =  	backends/c/liborbit-c-backend.a 	$(top_builddir)/libIDL/libIDL.la 	$(top_builddir)/popt/libpopt.la 	@GLIB_LIBS@ @GMODULE_LIBS@ 
 
 
 orbit_idl_SOURCES = orbit-idl-main.c 		   orbit-idl-driver.c 		   orbit-idl-backends.c 		   orbit-idl-passes.c 		   orbit-idl-genmarshal.c 		   orbit-idl-utils.c 		   orbit-idl2.h
@@ -179,7 +179,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  rm -f $(DESTDIR)$(bindir)/$$p.exe; \
 	done
 
 .c.o:
diff -Naurp ORBit-0.5.17/src/services/event/Makefile.in ORBit-0.5.17-cygwin/src/services/event/Makefile.in
--- ORBit-0.5.17/src/services/event/Makefile.in	2002-06-06 12:34:53.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/services/event/Makefile.in	2002-06-06 23:00:18.000000000 +0100
@@ -113,7 +113,7 @@ noinst_PROGRAMS = event-consumer #event-
 DEPS = $(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				$(top_builddir)/src/IIOP/libIIOP.la
 
 
-LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@ 								-lm
+LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@
 
 
 event_consumer_SOURCES = event-consumer.c					CosEventComm-skels.c	 						CosEventChannel-common.c 						CosEventChannel-stubs.c
@@ -205,6 +205,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p=`echo $$p | sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p; then \
 	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
@@ -656,8 +657,8 @@ mostlyclean distclean maintainer-clean
 $(CosEvent_built): my_cosevent_built
 
 my_cosevent_built: CosEventComm.idl CosEventChannel.idl $(IDL)
-	$(IDL) $(srcdir)/CosEventComm.idl
-	$(IDL) $(srcdir)/CosEventChannel.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(IDL) $(srcdir)/CosEventComm.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(IDL) $(srcdir)/CosEventChannel.idl
 	touch my_cosevent_built
 
 $(srcdir)/event-consumer.c $(srcdir)/event-supplier.c $(srcdir)/orbit-event-server.c: $(CosEvent_built)
diff -Naurp ORBit-0.5.17/src/services/name/Makefile.in ORBit-0.5.17-cygwin/src/services/name/Makefile.in
--- ORBit-0.5.17/src/services/name/Makefile.in	2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/services/name/Makefile.in	2002-06-06 23:00:18.000000000 +0100
@@ -123,10 +123,10 @@ CosNaming_built =  	CosNaming.h 								
 
 CLEANFILES = my_cosnaming_built
 
-DEPS = $(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			$(top_builddir)/src/IIOP/libIIOP.la				libORBitCosNaming.la
+DEPS = libORBitCosNaming.la $(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			$(top_builddir)/src/IIOP/libIIOP.la				
 
 
-LDADDS =  	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			libORBitCosNaming.la						@GLIB_LIBS@ 							-lm
+LDADDS = libORBitCosNaming.la 	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 									@GLIB_LIBS@ 
 
 
 #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h
@@ -182,7 +182,7 @@ name_client_OBJECTS =  name-client.$(OBJ
 orbit_name_server_OBJECTS =  boot.$(OBJEXT)
 old_name_server_OBJECTS =  orbit-name-server.$(OBJEXT) \
 CosNaming-skels.$(OBJEXT)
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(DLL_CFLAGS)
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -309,6 +309,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  if test -f $$p; then \
 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	    echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \
+	    install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \
 	  else :; fi; \
 	done
 
@@ -316,10 +319,14 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \
+	  rm -f $(DESTDIR)$(bindir)/$$dll; \
 	done
 
+libORBitCosNaming.la: DLL_CFLAGS = -DCOSNAMING_BUILD_DLL
 libORBitCosNaming.la: $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_LIBADD) $(LIBS)
+	cd .libs && PREFIX=$(prefix) sh ../../../../mkdll.sh $@ ../../../../src/orb/.libs/libORBit.dll.a				../../../../src/IIOP/.libs/libIIOP.dll.a				../../../../src/ORBitutil/.libs/libORBitutil.dll.a $$(glib-config --libs)  $(LIBS)
 
 mostlyclean-binPROGRAMS:
 
@@ -334,6 +341,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p; then \
 	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
 	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
@@ -840,7 +848,7 @@ $(CosNaming_built): my_cosnaming_built
 	@:
 
 my_cosnaming_built: CosNaming.idl $(srcdir)/LName.h $(IDL)
-	$(IDL) $(srcdir)/CosNaming.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(IDL) $(srcdir)/CosNaming.idl
 	cat $(srcdir)/LName.h >>CosNaming.h
 	touch my_cosnaming_built
 
diff -Naurp ORBit-0.5.17/src/services/name/new-name-server.c ORBit-0.5.17-cygwin/src/services/name/new-name-server.c
--- ORBit-0.5.17/src/services/name/new-name-server.c	2002-07-26 12:11:35.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/services/name/new-name-server.c	2002-07-26 12:12:49.000000000 +0100
@@ -295,7 +295,12 @@ server_is_alive(CORBA_Object server)
 #endif
 
     signal(SIGALRM, (void (*)(int))do_exit);
+#ifndef __CYGWIN__
     alarm(2);
+#else
+	/* cygwin can be very slow to fork(), so needs much longer timeout here */
+	alarm(20);
+#endif
     cnx = _ORBit_object_get_connection(server);
     syslog(LOG_DEBUG, "server_is_alive: cnx[%s] = %p\n",
 	   server->object_id, cnx);
diff -Naurp ORBit-0.5.17/test/Makefile.in ORBit-0.5.17-cygwin/test/Makefile.in
--- ORBit-0.5.17/test/Makefile.in	2002-06-06 12:34:57.000000000 +0100
+++ ORBit-0.5.17-cygwin/test/Makefile.in	2002-06-16 16:22:57.000000000 +0100
@@ -109,7 +109,7 @@ INCLUDES = -I$(top_builddir)/src/orb -I$
 #FLAGS =
 DEPS = $(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	$(top_builddir)/src/IIOP/libIIOP.la
 
-LDADDS =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm
+LDADDS =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 
 
 
 test_SOURCES = test.c
@@ -355,67 +355,67 @@ maintainer-clean-libtool:
 
 ior-decode$(EXEEXT): $(ior_decode_OBJECTS) $(ior_decode_DEPENDENCIES)
 	@rm -f ior-decode$(EXEEXT)
-	$(LINK) $(ior_decode_LDFLAGS) $(ior_decode_OBJECTS) $(ior_decode_LDADD) $(LIBS)
+	$(LINK) $(ior_decode_LDFLAGS) $(ior_decode_OBJECTS) $(ior_decode_LDADD) $(LIBS) -lextras
 
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
 	@rm -f test$(EXEEXT)
-	$(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+	$(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) -lextras
 
 test-dynamic$(EXEEXT): $(test_dynamic_OBJECTS) $(test_dynamic_DEPENDENCIES)
 	@rm -f test-dynamic$(EXEEXT)
-	$(LINK) $(test_dynamic_LDFLAGS) $(test_dynamic_OBJECTS) $(test_dynamic_LDADD) $(LIBS)
+	$(LINK) $(test_dynamic_LDFLAGS) $(test_dynamic_OBJECTS) $(test_dynamic_LDADD) $(LIBS) -lextras
 
 echo-client$(EXEEXT): $(echo_client_OBJECTS) $(echo_client_DEPENDENCIES)
 	@rm -f echo-client$(EXEEXT)
-	$(LINK) $(echo_client_LDFLAGS) $(echo_client_OBJECTS) $(echo_client_LDADD) $(LIBS)
+	$(LINK) $(echo_client_LDFLAGS) $(echo_client_OBJECTS) $(echo_client_LDADD) $(LIBS) -lextras
 
 echo-server$(EXEEXT): $(echo_server_OBJECTS) $(echo_server_DEPENDENCIES)
 	@rm -f echo-server$(EXEEXT)
-	$(LINK) $(echo_server_LDFLAGS) $(echo_server_OBJECTS) $(echo_server_LDADD) $(LIBS)
+	$(LINK) $(echo_server_LDFLAGS) $(echo_server_OBJECTS) $(echo_server_LDADD) $(LIBS) -lextras
 
 test-object$(EXEEXT): $(test_object_OBJECTS) $(test_object_DEPENDENCIES)
 	@rm -f test-object$(EXEEXT)
-	$(LINK) $(test_object_LDFLAGS) $(test_object_OBJECTS) $(test_object_LDADD) $(LIBS)
+	$(LINK) $(test_object_LDFLAGS) $(test_object_OBJECTS) $(test_object_LDADD) $(LIBS) -lextras
 
 echo-local$(EXEEXT): $(echo_local_OBJECTS) $(echo_local_DEPENDENCIES)
 	@rm -f echo-local$(EXEEXT)
-	$(LINK) $(echo_local_LDFLAGS) $(echo_local_OBJECTS) $(echo_local_LDADD) $(LIBS)
+	$(LINK) $(echo_local_LDFLAGS) $(echo_local_OBJECTS) $(echo_local_LDADD) $(LIBS) -lextras
 
 test-any-client$(EXEEXT): $(test_any_client_OBJECTS) $(test_any_client_DEPENDENCIES)
 	@rm -f test-any-client$(EXEEXT)
-	$(LINK) $(test_any_client_LDFLAGS) $(test_any_client_OBJECTS) $(test_any_client_LDADD) $(LIBS)
+	$(LINK) $(test_any_client_LDFLAGS) $(test_any_client_OBJECTS) $(test_any_client_LDADD) $(LIBS) -lextras
 
 test-any-server$(EXEEXT): $(test_any_server_OBJECTS) $(test_any_server_DEPENDENCIES)
 	@rm -f test-any-server$(EXEEXT)
-	$(LINK) $(test_any_server_LDFLAGS) $(test_any_server_OBJECTS) $(test_any_server_LDADD) $(LIBS)
+	$(LINK) $(test_any_server_LDFLAGS) $(test_any_server_OBJECTS) $(test_any_server_LDADD) $(LIBS) -lextras
 
 test-tc-client$(EXEEXT): $(test_tc_client_OBJECTS) $(test_tc_client_DEPENDENCIES)
 	@rm -f test-tc-client$(EXEEXT)
-	$(LINK) $(test_tc_client_LDFLAGS) $(test_tc_client_OBJECTS) $(test_tc_client_LDADD) $(LIBS)
+	$(LINK) $(test_tc_client_LDFLAGS) $(test_tc_client_OBJECTS) $(test_tc_client_LDADD) $(LIBS) -lextras
 
 test-tc-server$(EXEEXT): $(test_tc_server_OBJECTS) $(test_tc_server_DEPENDENCIES)
 	@rm -f test-tc-server$(EXEEXT)
-	$(LINK) $(test_tc_server_LDFLAGS) $(test_tc_server_OBJECTS) $(test_tc_server_LDADD) $(LIBS)
+	$(LINK) $(test_tc_server_LDFLAGS) $(test_tc_server_OBJECTS) $(test_tc_server_LDADD) $(LIBS) -lextras
 
 test-ir-client$(EXEEXT): $(test_ir_client_OBJECTS) $(test_ir_client_DEPENDENCIES)
 	@rm -f test-ir-client$(EXEEXT)
-	$(LINK) $(test_ir_client_LDFLAGS) $(test_ir_client_OBJECTS) $(test_ir_client_LDADD) $(LIBS)
+	$(LINK) $(test_ir_client_LDFLAGS) $(test_ir_client_OBJECTS) $(test_ir_client_LDADD) $(LIBS) -lextras
 
 test-ir-server$(EXEEXT): $(test_ir_server_OBJECTS) $(test_ir_server_DEPENDENCIES)
 	@rm -f test-ir-server$(EXEEXT)
-	$(LINK) $(test_ir_server_LDFLAGS) $(test_ir_server_OBJECTS) $(test_ir_server_LDADD) $(LIBS)
+	$(LINK) $(test_ir_server_LDFLAGS) $(test_ir_server_OBJECTS) $(test_ir_server_LDADD) $(LIBS) -lextras
 
 empty-server$(EXEEXT): $(empty_server_OBJECTS) $(empty_server_DEPENDENCIES)
 	@rm -f empty-server$(EXEEXT)
-	$(LINK) $(empty_server_LDFLAGS) $(empty_server_OBJECTS) $(empty_server_LDADD) $(LIBS)
+	$(LINK) $(empty_server_LDFLAGS) $(empty_server_OBJECTS) $(empty_server_LDADD) $(LIBS) -lextras
 
 empty-client$(EXEEXT): $(empty_client_OBJECTS) $(empty_client_DEPENDENCIES)
 	@rm -f empty-client$(EXEEXT)
-	$(LINK) $(empty_client_LDFLAGS) $(empty_client_OBJECTS) $(empty_client_LDADD) $(LIBS)
+	$(LINK) $(empty_client_LDFLAGS) $(empty_client_OBJECTS) $(empty_client_LDADD) $(LIBS) -lextras
 
 test-dynany$(EXEEXT): $(test_dynany_OBJECTS) $(test_dynany_DEPENDENCIES)
 	@rm -f test-dynany$(EXEEXT)
-	$(LINK) $(test_dynany_LDFLAGS) $(test_dynany_OBJECTS) $(test_dynany_LDADD) $(LIBS)
+	$(LINK) $(test_dynany_LDFLAGS) $(test_dynany_OBJECTS) $(test_dynany_LDADD) $(LIBS) -lextras
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1363,31 +1363,31 @@ $(srcdir)/test-ir-client.c $(srcdir)/tes
 echo.h echo-common.c echo-stubs.c echo-skels.c: echo_built
 
 echo_built: echo.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/echo.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/echo.idl
 	touch echo_built
 
 empty.h empty-common.c empty-stubs.c empty-skels.c: empty_built
 
 empty_built: empty.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/empty.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/empty.idl
 	touch empty_built
 
 test-any.h test-any-common.c test-any-stubs.c test-any-skels.c: test_any_built
 
 test_any_built: test-any.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/test-any.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/test-any.idl
 	touch test_any_built
 
 test-tc.h test-tc-common.c test-tc-stubs.c test-tc-skels.c: test_tc_built
 
 test_tc_built: test-tc.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/test-tc.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/test-tc.idl
 	touch test_tc_built
 
 test-ir.h test-ir-common.c test-ir-stubs.c test-ir-skels.c: test_ir_built
 
 test_ir_built: test-ir.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/test-ir.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/test-ir.idl
 	touch test_ir_built
 
 dist-hook:
diff -Naurp ORBit-0.5.17/test/everything/Makefile.in ORBit-0.5.17-cygwin/test/everything/Makefile.in
--- ORBit-0.5.17/test/everything/Makefile.in	2002-06-06 12:34:59.000000000 +0100
+++ ORBit-0.5.17-cygwin/test/everything/Makefile.in	2002-06-16 16:23:36.000000000 +0100
@@ -226,11 +226,11 @@ maintainer-clean-libtool:
 
 client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES)
 	@rm -f client$(EXEEXT)
-	$(LINK) $(client_LDFLAGS) $(client_OBJECTS) $(client_LDADD) $(LIBS)
+	$(LINK) $(client_LDFLAGS) $(client_OBJECTS) $(client_LDADD) $(LIBS) -lextras
 
 server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES)
 	@rm -f server$(EXEEXT)
-	$(LINK) $(server_LDFLAGS) $(server_OBJECTS) $(server_LDADD) $(LIBS)
+	$(LINK) $(server_LDFLAGS) $(server_OBJECTS) $(server_LDADD) $(LIBS) -lextras
 
 tags: TAGS
 
@@ -542,7 +542,7 @@ maintainer-clean-generic clean mostlycle
 
 
 ${EVERYTHING_BUILT}: everything.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(srcdir)/everything.idl
+	PATH=$(top_builddir)/libIDL/.libs:$$PATH $(ORBIT_IDL) $(srcdir)/everything.idl
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp ORBit-0.5.17/test/test-object.c ORBit-0.5.17-cygwin/test/test-object.c
--- ORBit-0.5.17/test/test-object.c	2002-06-06 12:07:46.000000000 +0100
+++ ORBit-0.5.17-cygwin/test/test-object.c	2002-06-06 23:00:18.000000000 +0100
@@ -12,8 +12,9 @@ int main(int argc, char **argv)
 {
 	CORBA_Object obj;
 	CORBA_Environment env;
-       
 
+	ORBit_chunks_init();
+	
 	obj = ORBit_CORBA_Object_new(&env);	
 
 	CORBA_Object_release(obj,&env);
diff -Naurp ORBit-0.5.17/test/test-poa/Makefile.in ORBit-0.5.17-cygwin/test/test-poa/Makefile.in
--- ORBit-0.5.17/test/test-poa/Makefile.in	2002-06-06 12:34:58.000000000 +0100
+++ ORBit-0.5.17-cygwin/test/test-poa/Makefile.in	2002-06-16 16:24:03.000000000 +0100
@@ -104,7 +104,7 @@ INCLUDES = -I$(top_builddir)/src/orb -I$
 FLAGS = -static
 DEPS = $(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	$(top_builddir)/src/IIOP/libIIOP.la
 
-LDADDS =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm
+LDADDS =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 
 
 
 test_poa_SOURCES = test.c
@@ -204,7 +204,7 @@ maintainer-clean-libtool:
 
 test-poa$(EXEEXT): $(test_poa_OBJECTS) $(test_poa_DEPENDENCIES)
 	@rm -f test-poa$(EXEEXT)
-	$(LINK) $(test_poa_LDFLAGS) $(test_poa_OBJECTS) $(test_poa_LDADD) $(LIBS)
+	$(LINK) $(test_poa_LDFLAGS) $(test_poa_OBJECTS) $(test_poa_LDADD) $(LIBS) -lextras
 
 tags: TAGS
 
diff -Naurp ORBit-0.5.17/src/IIOP/giop-msg-buffer.c ORBit-0.5.17-cygwin/src/IIOP/giop-msg-buffer.c
--- ORBit-0.5.17/src/IIOP/giop-msg-buffer.c	2002-06-06 12:07:34.000000000 +0100
+++ ORBit-0.5.17-cygwin/src/IIOP/giop-msg-buffer.c	2003-02-19 11:44:36.000000000 +0000
@@ -34,6 +34,10 @@
 #include "IIOP.h"
 #include "IIOP-private.h"
 
+#ifdef __CYGWIN__
+#include <cygextras.h>
+#endif
+
 #define MAX_LIMITED_IOVECS 16
 
 #ifdef        __GNUC__
@@ -210,6 +214,11 @@ giop_send_buffer_write(GIOPSendBuffer *s
 			res = writev (fd, curvec, MIN (nvecs, MAX_LIMITED_IOVECS));
 /*			fprintf (stderr, "wrote %ld bytes [%d]\n", res, (int) errno); */
 #else
+#ifdef __CYGWIN__
+			if (!check_is_nt())
+				res = writev (fd, curvec, MIN (nvecs, MAX_LIMITED_IOVECS));
+			else
+#endif
 			res = writev (fd, curvec, nvecs);
 #endif
 		} while (res < 0 && errno == EINTR);