diff -c -r R-0.90.1/src/appl/sock.c R-0.90.1-1/src/appl/sock.c
*** R-0.90.1/src/appl/sock.c	Fri Dec 10 04:15:48 1999
--- R-0.90.1-1/src/appl/sock.c	Wed Jan 05 22:57:54 2000
***************
*** 49,55 ****
--- 49,57 ----
  #  include <netdb.h>
  #  include <sys/socket.h>
  #  include <netinet/in.h>
+ #if 0
  #  include <netinet/tcp.h>
+ #endif
  #endif
  #include "sock.h"
diff -c -r R-0.90.1/src/gnuwin32/Makefile R-0.90.1-1/src/gnuwin32/Makefile
*** R-0.90.1/src/gnuwin32/Makefile	Sat Dec 11 02:55:06 1999
--- R-0.90.1-1/src/gnuwin32/Makefile	Fri Jan 07 17:13:36 2000
***************
*** 1,6 ****
  include MkRules
  
! HELP=YES
  WINHELP=BOTH # NO, CHM, BOTH
  
  PACKAGES=base eda lqs modreg mva nls splines stepfun ts
--- 1,6 ----
  include MkRules
  
! HELP=NO
  WINHELP=BOTH # NO, CHM, BOTH
  
  PACKAGES=base eda lqs modreg mva nls splines stepfun ts
***************
*** 11,26 ****
  PKGDIR=$(RHOME)/src/library
  PKGD=$(shell cd $(PKGDIR); pwd)# must be absolute path
  
  ifdef DEBUG
!  OPTFLAGS=-g -O2 -Wall
!  DLLFLAGS=
  else
   OPTFLAGS=-O2 -Wall -pedantic
   DLLFLAGS=-s 
  endif
  
  R-DLLFLAGS= $(STRIPFLAG) -mwindows
! R-DLLLIBS=-L. $(FLIBS) -lwsock32 -lcomctl32
  SOURCES=$(wildcard *.c *.f)
  OBJS=$(foreach i, $(SOURCES), $(basename $i).o)
  MAINLIBS=libmain.a libappl.a libmath.a
--- 11,27 ----
  PKGDIR=$(RHOME)/src/library
  PKGD=$(shell cd $(PKGDIR); pwd)# must be absolute path
  
+ DEBUG=1
  ifdef DEBUG
!  OPTFLAGS=-g -O2 -Wall -I/packages/include -Dssize_t=long
!  DLLFLAGS=-L/packages/lib
  else
   OPTFLAGS=-O2 -Wall -pedantic
   DLLFLAGS=-s 
  endif
  
  R-DLLFLAGS= $(STRIPFLAG) -mwindows
! R-DLLLIBS=-L. -lhdf5 $(FLIBS) -lwsock32 -lcomctl32 
  SOURCES=$(wildcard *.c *.f)
  OBJS=$(foreach i, $(SOURCES), $(basename $i).o)
  MAINLIBS=libmain.a libappl.a libmath.a
***************
*** 34,40 ****
  
  all: rbuild rdemo rpackage
  
! CFLAGS=$(OPTFLAGS) -I../include -I.
  FFLAGS=$(OPTFLAGS)
  
  rbuild: fixfiles makeMakedeps rlibs ../../bin/R.dll libR.a CHTML \
--- 35,41 ----
  
  all: rbuild rdemo rpackage
  
! CFLAGS=$(OPTFLAGS) -I../include -I. -I/packages/include
  FFLAGS=$(OPTFLAGS)
  
  rbuild: fixfiles makeMakedeps rlibs ../../bin/R.dll libR.a CHTML \
diff -c -r R-0.90.1/src/gnuwin32/MkRules R-0.90.1-1/src/gnuwin32/MkRules
*** R-0.90.1/src/gnuwin32/MkRules	Sat Dec 11 02:55:06 1999
--- R-0.90.1-1/src/gnuwin32/MkRules	Fri Jan 07 17:01:28 2000
***************
*** 42,48 ****
  MKDIR=mkdir
  CAT=cat
  CC=$(BINPREF)gcc $(MINGW32CFLAG) 
! F77=$(BINPREF)g77
  AS=$(BINPREF)as
  DLL=$(BINPREF)gcc $(MINGW32LDFLAG) -mdll
  DLLTOOL=$(BINPREF)dlltool -k --as $(AS)
--- 42,48 ----
  MKDIR=mkdir
  CAT=cat
  CC=$(BINPREF)gcc $(MINGW32CFLAG) 
! F77=$(BINPREF)g77 -mno-cygwin
  AS=$(BINPREF)as
  DLL=$(BINPREF)gcc $(MINGW32LDFLAG) -mdll
  DLLTOOL=$(BINPREF)dlltool -k --as $(AS)
diff -c -r R-0.90.1/src/gnuwin32/fixed/h/Rconfig.h R-0.90.1-1/src/gnuwin32/fixed/h/Rconfig.h
*** R-0.90.1/src/gnuwin32/fixed/h/Rconfig.h	Fri Nov 26 11:13:36 1999
--- R-0.90.1-1/src/gnuwin32/fixed/h/Rconfig.h	Wed Jan 05 23:22:36 2000
***************
*** 75,81 ****
  #define HAVE_RPC_XDR_H 1
  
  /* HDF5 Library Available */
! #undef HAVE_HDF5
  
  /* General String Comparison */
  #undef HAVE_STRCOLL
--- 75,81 ----
  #define HAVE_RPC_XDR_H 1
  
  /* HDF5 Library Available */
! #define HAVE_HDF5
  
  /* General String Comparison */
  #undef HAVE_STRCOLL
diff -c -r R-0.90.1/src/gnuwin32/xdr/rpc/rpc.h R-0.90.1-1/src/gnuwin32/xdr/rpc/rpc.h
*** R-0.90.1/src/gnuwin32/xdr/rpc/rpc.h	Sun Jul 18 01:17:34 1999
--- R-0.90.1-1/src/gnuwin32/xdr/rpc/rpc.h	Fri Jan 07 12:18:20 2000
***************
*** 107,114 ****
  
  /* semi-private protocol headers */
  #include <rpc/rpc_msg.h>	/* protocol for rpc messages */
  #ifdef WIN32
- #include <rpc/auth_uni.h>	/* protocol for unix style cred */
  #else
  #include <rpc/auth_unix.h>	/* protocol for unix style cred */
  #endif
--- 107,114 ----
  
  /* semi-private protocol headers */
  #include <rpc/rpc_msg.h>	/* protocol for rpc messages */
+ #define WIN32
  #ifdef WIN32
  #else
  #include <rpc/auth_unix.h>	/* protocol for unix style cred */
  #endif
diff -c -r R-0.90.1/src/include/Defn.h R-0.90.1-1/src/include/Defn.h
*** R-0.90.1/src/include/Defn.h	Thu Dec 09 02:34:36 1999
--- R-0.90.1-1/src/include/Defn.h	Fri Jan 07 16:09:06 2000
***************
*** 92,98 ****
  #  endif
  #endif
  
! #ifdef HAVE_POSIX_SETJMP
  # define JMP_BUF sigjmp_buf
  # define SETJMP(x) sigsetjmp(x,1)
  # define LONGJMP(x,i) siglongjmp(x,i)
--- 92,98 ----
  #  endif
  #endif
  
! #if defined(HAVE_POSIX_SETJMP) && 0
  # define JMP_BUF sigjmp_buf
  # define SETJMP(x) sigsetjmp(x,1)
  # define LONGJMP(x,i) siglongjmp(x,i)